Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=72d23b0b61b06723c946980858ecdc97b2b82e0b
commit 72d23b0b61b06723c946980858ecdc97b2b82e0b Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Fri Nov 7 14:31:12 2008 +0100 splashy-0.3.12-1-i686 - version bump - remove no longer necessary static.diff (the real bug was in the fbset pkg) diff --git a/source/xapps/splashy/FrugalBuild b/source/xapps/splashy/FrugalBuild index b8f63f7..f2735a0 100644 --- a/source/xapps/splashy/FrugalBuild +++ b/source/xapps/splashy/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Miklos Vajna <[EMAIL PROTECTED]> pkgname=splashy -pkgver=0.3.11 +pkgver=0.3.12 themever=0.9.1 # see http://alioth.debian.org/project/showfiles.php?group_id=30657 -rel_id=2519 -pkgrel=4 +rel_id=2630 +pkgrel=1 pkgdesc="A complete user-space boot splash system" url="http://alioth.debian.org/projects/splashy/"; depends=('glib2' 'libgcc' 'file') @@ -20,17 +20,15 @@ up2date="lynx -dump $url |grep ' splashy '|sed 's/.*splashy \([^ ]*\) .*/\1/'" source=(http://alioth.debian.org/download.php/$rel_id/splashy-$pkgver.tar.gz \ splashy-0.3.0-frugalware.diff \ rc.{zz-,}splash rc.splash-{de,hu,it}.po \ - http://ftp.frugalware.org/pub/other/artwork/splashy-theme/splashy-frugalware-$themever.tar.gz \ - static.diff) -sha1sums=('9af69c57dd1e19b7912ddc701bfaf2c63411aa2f' \ + http://ftp.frugalware.org/pub/other/artwork/splashy-theme/splashy-frugalware-$themever.tar.gz) +sha1sums=('4e721222b20b8fd3fbb8c845ed5c0f05ccead68a' \ 'fe5c5f6a6085512669fe0a4f9051e4a4ab884fb4' \ '006d65bb621d1108cbb994fb50712bad4d61b6d0' \ 'd1b6ed6208c25f848d3e6b94f30bba339056e309' \ '82c272166e89ecc840169fa76cc3fb45e2236712' \ 'd86d3554aa64b129352e826d1e659a5a4611b47d' \ 'c9da7e70efb6070e61ba2e6908a712ac524ae90b' \ - '732a1370a7b5fa2943e4f5bb5d6f3ea350cf77b4' \ - '3c99a10ecc63c75086bb1ceb496d913dfc93886d') + '732a1370a7b5fa2943e4f5bb5d6f3ea350cf77b4') build() { diff --git a/source/xapps/splashy/static.diff b/source/xapps/splashy/static.diff deleted file mode 100644 index c427234..0000000 --- a/source/xapps/splashy/static.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 409e5fd..dec388c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -85,8 +85,8 @@ AC_SUBST(DFB_LIBDIR) - # to modify src/Makefile.am where it says "STATIC" - # sample options to include to directfb-config below (before ' | sed ...'): - #--input=keyboard --imageprovider=png --font=ft2,default --DFB_LIBS="$(eval directfb-config --libs | sed 's/$/ \\/')" --#AC_DEFINE([DFB_LIBS], [$DFB_LIBS], [directfb libs]) -+DFB_LIBS="$(eval directfb-config --libs --input=keyboard --imageprovider=png --font=ft2,default| sed 's/$/ \\/')" -+AC_DEFINE([DFB_LIBS], [$DFB_LIBS], [directfb libs]) - AC_SUBST(DFB_LIBS) - - # TODO slurp the doc/*.xml.in or .xml files and create xml_format.h -diff --git a/src/Makefile.am b/src/Makefile.am -index a93a1f1..5e1e23f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -38,21 +38,21 @@ libsplashycnf_la_LDFLAGS = -export-symbols-regex splashy_.*\ - -version-info $(SPL_SONAME) - - splashy_SOURCES = splashy_main.c splashy_functions.c --splashy_LDADD = libsplashycnf.la libsplashy.la -lpthread -lgcc_s -lm -lglib-2.0 @DFB_LIBS@ -+splashy_LDADD = libsplashycnf.la libsplashy.la -lpthread -lm -lglib-2.0 @DFB_LIBS@ - - # '-lgcc_s' is provided with -static-libgcc and this is needed when compiling statically only - # uncomment the following for static builds: --#splashy_LDFLAGS = -all-static -static-libgcc $(DFBHACK) -+splashy_LDFLAGS = -all-static -static-libgcc $(DFBHACK) - # all other builds: - # FIXME doesn't DFB_LIBS provide this from configure.ac? $(shell directfb-config --libs) --splashy_LDFLAGS = -rpath $(libdir)/directfb-1.0-0/systems:$(libdir)/directfb-1.0-0/wm:/usr/lib64/directfb-1.0-0/interfaces/IDirectFBFont/:$(libdir)/directfb-1.0-0/interfaces/IDirectFBImageProvider:$(libdir)/directfb-1.0-0/inputdrivers -+#splashy_LDFLAGS = -rpath $(libdir)/directfb-1.0-0/systems:$(libdir)/directfb-1.0-0/wm:/usr/lib64/directfb-1.0-0/interfaces/IDirectFBFont/:$(libdir)/directfb-1.0-0/interfaces/IDirectFBImageProvider:$(libdir)/directfb-1.0-0/inputdrivers - - splashy_config_SOURCES = splashy_config-main.c splashy_config-functions.c \ - xml_functions.c - splashy_config_LDFLAGS = -lsplashycnf -lglib-2.0 -lmagic -lz - - # uncomment the following if you need static builds for splashy_update as well: --#splashy_update_LDFLAGS = -all-static -static-libgcc -+splashy_update_LDFLAGS = -all-static -static-libgcc - splashy_update_SOURCES = splashy_update.c - - install-exec-hook: _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
