From: <jed...@us...> - 2009-12-14 08:07:45
|
Revision: 2262 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=2262&view=rev Author: jedywang Date: 2009-12-14 08:07:24 +0000 (Mon, 14 Dec 2009) Log Message: ----------- 2009-12-14 Wang Xin <jed...@su...> Update the patch to make it upstreamable. * SFEgtkimageview.spec: * patches/gtkimageview-01-cflags.diff: Modified Paths: -------------- spec-files-extra/trunk/ChangeLog spec-files-extra/trunk/SFEgtkimageview.spec spec-files-extra/trunk/patches/gtkimageview-01-cflags.diff Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2009-12-11 07:06:39 UTC (rev 2261) +++ spec-files-extra/trunk/ChangeLog 2009-12-14 08:07:24 UTC (rev 2262) @@ -1,3 +1,10 @@ +2009-12-14 Wang Xin <jed...@su...> + + Update the patch to make it upstreamable. + + * SFEgtkimageview.spec: + * patches/gtkimageview-01-cflags.diff: + 2009-12-11 Simon Jin <yun...@su...> * SFEpython-buildbot.spec: Modified: spec-files-extra/trunk/SFEgtkimageview.spec =================================================================== --- spec-files-extra/trunk/SFEgtkimageview.spec 2009-12-11 07:06:39 UTC (rev 2261) +++ spec-files-extra/trunk/SFEgtkimageview.spec 2009-12-14 08:07:24 UTC (rev 2262) @@ -35,6 +35,13 @@ export LDFLAGS="%_ldflags" +aclocal $ACLOCAL_FLAGS +glib-gettextize --force --copy +intltoolize --force --automake +gtkdocize + +automake -a -f -c --gnu +autoconf ./configure --prefix=%{_prefix} \ --bindir=%{_bindir} \ --libdir=%{_libdir} \ @@ -70,5 +77,7 @@ %changelog +* Mon Dec 14 2009 - jed...@su... +- Regenerate cofngiure before building. * Sun Oct 11 2009 - Milan Jurik - Initial spec Modified: spec-files-extra/trunk/patches/gtkimageview-01-cflags.diff =================================================================== --- spec-files-extra/trunk/patches/gtkimageview-01-cflags.diff 2009-12-11 07:06:39 UTC (rev 2261) +++ spec-files-extra/trunk/patches/gtkimageview-01-cflags.diff 2009-12-14 08:07:24 UTC (rev 2262) @@ -1,7 +1,14 @@ ---- gtkimageview-1.6.4/configure 2009-04-05 22:04:32.000000000 +0200 -+++ gtkimageview-1.6.4-patch/configure 2009-10-11 12:38:02.443158240 +0200 -@@ -20740,4 +20739,0 @@ --###################################################################### --##### Twiddle CFLAGS ################################################# --###################################################################### +diff -uprN gtkimageview-1.6.4/configure.in gtkimageview-1.6.4-new/configure.in +--- gtkimageview-1.6.4/configure.in 2009-04-06 04:02:43.000000000 +0800 ++++ gtkimageview-1.6.4-new/configure.in 2009-12-14 15:47:28.829003188 +0800 +@@ -39,7 +39,9 @@ GTK_DOC_CHECK([1.8]) + ###################################################################### + ##### Twiddle CFLAGS ################################################# + ###################################################################### -CFLAGS="${CFLAGS} -Wall -Werror -std=c99 -Wmissing-prototypes" ++if test "x$GCC" = "xyes"; then ++ CFLAGS="${CFLAGS} -Wall -Werror -std=c99 -Wmissing-prototypes" ++fi + + + ###################################################################### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |