diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2005-08-31 19:43:44 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-31 19:43:44 +0000 |
| commit | ea899cfb752cf00b2f194d64c76fdfdecfb1f6c9 (patch) | |
| tree | e15c23254192e6ee16d9908d0f603cd1e9387c10 | |
| parent | 0efdc7fcf146d35f323a03133513f13b6053edf9 (diff) | |
| parent | c1dc05985df7c60cfb7ace030286bd8e390975b8 (diff) | |
merge of a1f958bfb17d37993e7a48aa74996ba57455f0da
and f3ece6ea75e5b528c7e2e25b3510a0dd029cb823
| -rw-r--r-- | packages/e17/e-wm/remove-large-fonts.patch | 25 | ||||
| -rw-r--r-- | packages/e17/e-wm_20050810.bb | 5 | ||||
| -rw-r--r-- | packages/e17/entrance_20050810.bb | 4 | ||||
| -rw-r--r-- | packages/openntpd/files/init | 2 |
4 files changed, 31 insertions, 5 deletions
diff --git a/packages/e17/e-wm/remove-large-fonts.patch b/packages/e17/e-wm/remove-large-fonts.patch new file mode 100644 index 0000000000..8ac1721a56 --- /dev/null +++ b/packages/e17/e-wm/remove-large-fonts.patch @@ -0,0 +1,25 @@ +diff -Nur e~/data/fonts/Makefile.am e/data/fonts/Makefile.am +--- e~/data/fonts/Makefile.am 2005-08-31 09:54:20.000000000 -0700 ++++ e/data/fonts/Makefile.am 2005-08-31 09:54:42.000000000 -0700 +@@ -15,10 +15,6 @@ + baekmuk.COPYING \ + dotum.ttf \ + fonts.alias \ +-fonts.dir \ +-kochi-gothic.ttf \ +-kochi.COPYING \ +-fireflysung.ttf \ +-fireflysung.COPYING ++fonts.dir + + EXTRA_DIST = $(files_DATA) +diff -Nur e~/data/fonts/fonts.dir e/data/fonts/fonts.dir +--- e~/data/fonts/fonts.dir 2005-08-31 09:54:20.000000000 -0700 ++++ e/data/fonts/fonts.dir 2005-08-31 09:54:56.000000000 -0700 +@@ -50,6 +50,3 @@ + VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15 + VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9 + dotum.ttf -misc-Baekmuk Dotum-medium-r-normal--0-0-0-0-p-0-iso8859-1 +-kochi-gothic.ttf -misc-Kochi Gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0 +-kochi-gothic.ttf -misc-Kochi Gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1 +-fireflysung.ttf -misc-New Sung-medium-r-normal--0-0-0-0-p-0-iso8859-1 diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb index e0fa41311c..c6cbee4cd9 100644 --- a/packages/e17/e-wm_20050810.bb +++ b/packages/e17/e-wm_20050810.bb @@ -4,12 +4,13 @@ LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" CVSDATE = "${PV}" -PR = "r2" +PR = "r3" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ file://Xsession.d/98enlightenment \ file://fix-configure.patch;patch=1 \ - file://add-menu-autoscroll-options.patch;patch=1" + file://add-menu-autoscroll-options.patch;patch=1 \ + file://remove-large-fonts.patch;patch=1" S = "${WORKDIR}/e" inherit autotools diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index 65d9482c02..2af2816457 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -3,11 +3,11 @@ SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt DEPENDS = "edb evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common" -RDEPENDS += "bash keylaunch detect-stylus x11-common" +RDEPENDS += "bash keylaunch detect-stylus x11-common glibc-gconv-iso8859-1" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" CVSDATE = "${PV}" -PR = "r5" +PR = "r6" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ file://Xserver.patch;patch=1 \ diff --git a/packages/openntpd/files/init b/packages/openntpd/files/init index 37c923f688..d35c65299d 100644 --- a/packages/openntpd/files/init +++ b/packages/openntpd/files/init @@ -7,7 +7,7 @@ ntpd=/usr/sbin/ntpd test -x "$ntpd" || exit 0 -[ -d /var/shared/empty ] && mkdir /var/shared/empty +[ ! -d /var/shared/empty ] && mkdir /var/shared/empty case "$1" in start) |