Author: richard
Date: Thu Mar 5 14:08:02 2009
New Revision: 4701
URL: http://svn.slimdevices.com/jive?rev=4701&view=rev
Log:
r4...@harrypotter (orig r4699): richard | 2009-03-05 21:58:11 +0000
Bug: N/A
Description:
Remove unused fonts.
r4...@harrypotter (orig r4700): richard | 2009-03-05 22:05:23 +0000
Bug: N/A
Description:
Updated git from open embedded, this fixes some builds errors.
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/autotools.patch
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/git-gui-install-mode-arg-spaces.patch
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git-native_1.5.2.3.bb
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git.inc
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git_1.5.2.3.bb
Removed:
7.4/branches/pango/squeezeplay/src/fonts-clock/
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/Makefile.linux
7.4/branches/pango/squeezeplay/src/Makefile.osx
7.4/branches/pango/squeezeplay/src/Makefile.squeezeos
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Mar 5 14:08:02 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4673
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4685
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4700
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/autotools.patch
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/autotools.patch?rev=4701&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/autotools.patch
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/autotools.patch
Thu Mar 5 14:08:02 2009
@@ -1,0 +1,27 @@
+Index: git-1.5.2.3/configure.ac
+===================================================================
+--- git-1.5.2.3.orig/configure.ac 2007-07-02 10:11:39.000000000 +0200
++++ git-1.5.2.3/configure.ac 2007-08-04 00:02:13.000000000 +0200
+@@ -235,7 +235,8 @@
+ else if (strcmp(buf, "12345"))
+ exit(2);]])],
+ [ac_cv_c_c99_format=yes],
+- [ac_cv_c_c99_format=no])
++ [ac_cv_c_c99_format=no],
++ [ac_cv_c_c99_format=yes])
+ ])
+ if test $ac_cv_c_c99_format = no; then
+ NO_C99_FORMAT=YesPlease
+Index: git-1.5.2.3/config.mak.in
+===================================================================
+--- git-1.5.2.3.orig/config.mak.in 2007-07-02 10:11:39.000000000 +0200
++++ git-1.5.2.3/config.mak.in 2007-08-04 00:07:04.000000000 +0200
+@@ -3,6 +3,7 @@
+
+ CC = @CC@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ AR = @AR@
+ TAR = @TAR@
+ #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
+
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/git-gui-install-mode-arg-spaces.patch
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/git-gui-install-mode-arg-spaces.patch?rev=4701&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/git-gui-install-mode-arg-spaces.patch
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/files/git-gui-install-mode-arg-spaces.patch
Thu Mar 5 14:08:02 2009
@@ -1,0 +1,33 @@
+--- git/git-gui/Makefile.orig 2007-12-26 17:16:42.000000000 +1030
++++ git/git-gui/Makefile 2007-12-26 17:17:16.000000000 +1030
+@@ -31,11 +31,11 @@
+ INSTALL = install
+ endif
+
+-INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
++INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
+ INSTALL_D1 =
+-INSTALL_R0 = $(INSTALL) -m644 # space is required here
++INSTALL_R0 = $(INSTALL) -m 644 # space is required here
+ INSTALL_R1 =
+-INSTALL_X0 = $(INSTALL) -m755 # space is required here
++INSTALL_X0 = $(INSTALL) -m 755 # space is required here
+ INSTALL_X1 =
+ INSTALL_L0 = rm -f # space is required here
+ INSTALL_L1 = && ln # space is required here
+@@ -50,11 +50,11 @@
+ QUIET_2DEVNULL = 2>/dev/null
+
+ INSTALL_D0 = dir=
+- INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir"
++ INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
+ INSTALL_R0 = src=
+- INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL)
-m644 $$src
++ INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL)
-m 644 $$src
+ INSTALL_X0 = src=
+- INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL)
-m755 $$src
++ INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL)
-m 755 $$src
+
+ INSTALL_L0 = dst=
+ INSTALL_L1 = && src=
+
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git-native_1.5.2.3.bb
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git-native_1.5.2.3.bb?rev=4701&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git-native_1.5.2.3.bb
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git-native_1.5.2.3.bb
Thu Mar 5 14:08:02 2009
@@ -1,0 +1,7 @@
+
+inherit native
+require git_${PV}.bb
+
+DEPENDS = "openssl-native curl-native zlib-native expat-native"
+RDEPENDS = ""
+
Added: 7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git.inc
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git.inc?rev=4701&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git.inc
(added)
+++ 7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git.inc Thu
Mar 5 14:08:02 2009
@@ -1,0 +1,22 @@
+DESCRIPTION = "The git revision control system used by the Linux kernel
developers"
+SECTION = "console/utils"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
+ file://autotools.patch;patch=1 \
+ file://git-gui-install-mode-arg-spaces.patch;patch=1 \
+ "
+S = "${WORKDIR}/git-${PV}"
+
+EXTRA_OEMAKE = "NO_TCLTL=1"
+
+inherit autotools
+
+do_install () {
+ oe_runmake install prefix=${D} bindir=${D}${bindir} \
+ template_dir=${D}${datadir}/git-core/templates \
+ GIT_PYTHON_DIR=${D}${datadir}/git-core/python
+}
+
+FILES_${PN} += "${datadir}/git-core"
+
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git_1.5.2.3.bb
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git_1.5.2.3.bb?rev=4701&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git_1.5.2.3.bb
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/git/git_1.5.2.3.bb
Thu Mar 5 14:08:02 2009
@@ -1,0 +1,26 @@
+DESCRIPTION = "The git revision control system used by the Linux kernel
developers"
+SECTION = "console/utils"
+LICENSE = "GPL"
+PR="r4"
+
+inherit autotools
+
+SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
+ file://autotools.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/git-${PV}"
+
+DEPENDS = "openssl curl zlib expat"
+RDEPENDS = "perl perl-module-file-path cpio findutils sed"
+
+EXTRA_OEMAKE = "NO_TCLTK=1"
+
+do_install() {
+ oe_runmake install DESTDIR="${D}" bindir="${bindir}" \
+ template_dir="${datadir}/git-core/templates" \
+ GIT_PYTHON_DIR="${datadir}/git-core/python"
+}
+
+FILES_${PN} += "${datadir}/git-core"
+
Modified: 7.4/branches/pango/squeezeplay/src/Makefile.linux
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/Makefile.linux?rev=4701&r1=4700&r2=4701&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/Makefile.linux (original)
+++ 7.4/branches/pango/squeezeplay/src/Makefile.linux Thu Mar 5 14:08:02 2009
@@ -229,9 +229,6 @@
mkdir -p ${PREFIX}/share/jive/fonts
cp freefont-20060126/FreeSans.ttf ${PREFIX}/share/jive/fonts
cp freefont-20060126/FreeSansBold.ttf ${PREFIX}/share/jive/fonts
-# fonts for clock screensaver
- cp fonts-clock/Digital.ttf ${PREFIX}/share/jive/fonts
- cp fonts-clock/DigitalItalic.ttf ${PREFIX}/share/jive/fonts
#
# This builds the .tarball. It's called by 'all' so no need to run it manually
Modified: 7.4/branches/pango/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/Makefile.osx?rev=4701&r1=4700&r2=4701&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/Makefile.osx (original)
+++ 7.4/branches/pango/squeezeplay/src/Makefile.osx Thu Mar 5 14:08:02 2009
@@ -365,9 +365,6 @@
mkdir -p ${PREFIX}/share/jive/fonts
cp freefont-20080912/FreeSans.ttf ${PREFIX}/share/jive/fonts
cp freefont-20080912/FreeSansBold.ttf ${PREFIX}/share/jive/fonts
-# fonts for clock screensaver
- cp fonts-clock/Digital.ttf ${PREFIX}/share/jive/fonts
- cp fonts-clock/DigitalItalic.ttf ${PREFIX}/share/jive/fonts
squeezeplay_dmg: squeezeplay/Makefile
cd squeezeplay; make SqueezePlay_dmg
Modified: 7.4/branches/pango/squeezeplay/src/Makefile.squeezeos
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/Makefile.squeezeos?rev=4701&r1=4700&r2=4701&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/Makefile.squeezeos (original)
+++ 7.4/branches/pango/squeezeplay/src/Makefile.squeezeos Thu Mar 5 14:08:02
2009
@@ -138,8 +138,8 @@
#
# squeezeplay
#
-.PHONY: squeezeplay-all portaudio flac libmad tremor squeezeplay
squeezeplay_jive freefont fonts-clock
-squeezeplay-all: portaudio flac libmad tremor squeezeplay squeezeplay_jive
freefont fonts-clock
+.PHONY: squeezeplay-all portaudio flac libmad tremor squeezeplay
squeezeplay_jive freefont
+squeezeplay-all: portaudio flac libmad tremor squeezeplay squeezeplay_jive
freefont
# portaudio
@@ -196,10 +196,6 @@
mkdir -p ${PREFIX}/share/jive/fonts
cp freefont-20060126/FreeSans.ttf ${PREFIX}/share/jive/fonts
cp freefont-20060126/FreeSansBold.ttf ${PREFIX}/share/jive/fonts
-
-fonts-clock:
- cp fonts-clock/DigitalItalic.ttf ${PREFIX}/share/jive/fonts
- cp fonts-clock/Digital.ttf ${PREFIX}/share/jive/fonts
.PHONY: clean
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
