Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=54770d3a1ee7abb99e5a13541c228d0bc4b6b095
commit 54770d3a1ee7abb99e5a13541c228d0bc4b6b095 Author: DeX77 <[email protected]> Date: Thu May 19 14:17:39 2016 +0200 libindicator-12.10.1-1-x86_64 * version bump * switch to gtk3 diff --git a/source/xlib-extra/libindicator/FrugalBuild b/source/xlib-extra/libindicator/FrugalBuild index 04496aa..4cf0f81 100644 --- a/source/xlib-extra/libindicator/FrugalBuild +++ b/source/xlib-extra/libindicator/FrugalBuild @@ -2,27 +2,22 @@ # Maintainer: Devil505 <[email protected]> pkgname=libindicator -pkgver=0.5.0 +pkgver=12.10.1 pkgrel=1 pkgdesc="A set of symbols and convenience functions that all indicators would like to use." url="https://launchpad.net/libindicator"; -depends=('gtk+2' 'gtk+3' 'dbus-glib') -options=('scriptlet') +depends=('gtk+3') +makedepends+=('x11-protos') groups=('xlib-extra') archs=('i686' 'x86_64') -_F_launchpad_branch="0.5" +_F_launchpad_branch="12.10" +Fconfopts+=" --with-gtk=3" Finclude launchpad -sha1sums=('179752635f83810a7a25238ca8a45a64093de262') - -unset MAKEFLAGS - -build() { - Fpatchall - Fmake --with-gtk=3 - Fmakeinstall - make clean || Fdie - Fmake --with-gtk=2 - Fmakeinstall -} +source=("${source[@]}" \ + fix-depreation-error.patch \ + fix-linkage.patch) +sha1sums=('25c8a0a150651ee6b2198df3f36fcbb49f0295c2' \ + '1a26905f8a120362eb34ccc8fe848e1014853981' \ + '7457800174c5ff758c05318c3eff8af1f5e33c23') # optimization OK diff --git a/source/xlib-extra/libindicator/fix-depreation-error.patch b/source/xlib-extra/libindicator/fix-depreation-error.patch new file mode 100644 index 0000000..674f637 --- /dev/null +++ b/source/xlib-extra/libindicator/fix-depreation-error.patch @@ -0,0 +1,22 @@ +--- libindicator-12.10.1/libindicator/Makefile.am 2012-09-19 17:38:05.000000000 +0200 ++++ libindicator-12.10.1.new/libindicator/Makefile.am 2016-05-19 14:09:21.000000000 +0200 +@@ -57,7 +57,7 @@ + $(LIBINDICATOR_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + -DG_LOG_DOMAIN=\"libindicator\" \ +- -Wall -Werror ++ -Wall -Wno-deprecated-declarations + + libindicator_la_LIBADD = \ + $(LIBINDICATOR_LIBS) +--- libindicator-12.10.1/libindicator/Makefile.in 2012-09-19 17:40:09.000000000 +0200 ++++ libindicator-12.10.1.new/libindicator/Makefile.in 2016-05-19 14:09:31.000000000 +0200 +@@ -380,7 +380,7 @@ + $(LIBINDICATOR_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + -DG_LOG_DOMAIN=\"libindicator\" \ +- -Wall -Werror ++ -Wall -Wno-deprecated-declarations + + libindicator_la_LIBADD = \ + $(LIBINDICATOR_LIBS) diff --git a/source/xlib-extra/libindicator/fix-linkage.patch b/source/xlib-extra/libindicator/fix-linkage.patch new file mode 100644 index 0000000..1dd690d --- /dev/null +++ b/source/xlib-extra/libindicator/fix-linkage.patch @@ -0,0 +1,55 @@ +--- libindicator-12.10.1/configure 2012-09-19 17:40:08.000000000 +0200 ++++ libindicator-12.10.1.new/configure 2016-05-19 14:15:17.000000000 +0200 +@@ -12021,7 +12021,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmw $LIBS" ++LIBS=" -lmw $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -12052,7 +12052,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 + $as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; } + if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then : +- LIBM="-lmw" ++ LIBM=" -lmw" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 +@@ -12061,7 +12061,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $LIBS" ++LIBS=" -lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -12103,7 +12103,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $LIBS" ++LIBS=" -lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -12134,14 +12134,14 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 + $as_echo "$ac_cv_lib_m_cos" >&6; } + if test "x$ac_cv_lib_m_cos" = xyes; then : +- LIBM="-lm" ++ LIBM=" -lm" + fi + + ;; + esac + + +-LIBINDICATOR_LIBS+="$LIBM" ++LIBINDICATOR_LIBS+=" $LIBM" + + ############################## + # Custom Junk _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
