Author: glen Date: Mon Aug 23 22:36:05 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fix --no-copy-dt-needed-entries linking (add nspr libs)
- --as-needed still needs a fix, filtered out for now; rel 12
---- Files affected:
packages/gnome-web-photo:
gnome-web-photo-libxul.patch (1.3 -> 1.4) , gnome-web-photo.spec (1.45 ->
1.46)
---- Diffs:
================================================================
Index: packages/gnome-web-photo/gnome-web-photo-libxul.patch
diff -u packages/gnome-web-photo/gnome-web-photo-libxul.patch:1.3
packages/gnome-web-photo/gnome-web-photo-libxul.patch:1.4
--- packages/gnome-web-photo/gnome-web-photo-libxul.patch:1.3 Fri Jan 22
21:13:30 2010
+++ packages/gnome-web-photo/gnome-web-photo-libxul.patch Tue Aug 24
00:35:59 2010
@@ -1,4 +1,3 @@
-diff -urN gnome-web-photo-0.4/src/Makefile.am
gnome-web-photo-0.4.new/src/Makefile.am
--- gnome-web-photo-0.4/src/Makefile.am 2008-03-10 20:08:40.000000000
+0100
+++ gnome-web-photo-0.4.new/src/Makefile.am 2008-07-08 18:04:10.000000000
+0200
@@ -13,6 +13,9 @@
@@ -20,14 +19,25 @@
-DSHARE_DIR=\"$(pkgdatadir)\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DGECKO_HOME=\"$(GECKO_HOME)\" \
---- gnome-web-photo-0.9/m4/libxul.m4 2009-04-20 17:43:33.000000000 +0200
-+++ gnome-web-photo-0.9/m4/libxul.m4.new 2010-01-22 21:07:15.164217015
+0100
-@@ -59,7 +59,7 @@
+--- gnome-web-photo-0.9/m4/libxul.m4.new 2010-01-22 21:07:15.164217015
+0100
++++ gnome-web-photo-0.9/m4/libxul.m4 2010-08-24 01:24:06.985077917 +0300
+@@ -59,7 +59,9 @@
# I can figure this out, do it like this:
libxul_cv_libdir="$($PKG_CONFIG --variable=sdkdir $libxul_cv_libxul_pkg)/bin"
-libxul_cv_includes="$($PKG_CONFIG --cflags-only-I libxul-unstable libxul)"
+libxul_cv_includes="$($PKG_CONFIG --cflags-only-I libxul)"
++
++nspr_libs="$($PKG_CONFIG --libs nspr)"
AC_DEFINE([HAVE_LIBXUL],[1],[Define for libxul])
+@@ -75,7 +77,7 @@
+
+ # Can't use the value from the .pc file, since it seems buggy
+ # Until I can figure it out, do this instead
+-LIBXUL_LIBS="-L${libxul_cv_sdkdir}/lib -lxpcomglue_s
-L${libxul_cv_sdkdir}/bin -lxul -lxpcom"
++LIBXUL_LIBS="-L${libxul_cv_sdkdir}/lib -lxpcomglue_s
-L${libxul_cv_sdkdir}/bin -lxul -lxpcom ${nspr_libs}"
+
+ # ***********************
+ # Check for -fshort-wchar
================================================================
Index: packages/gnome-web-photo/gnome-web-photo.spec
diff -u packages/gnome-web-photo/gnome-web-photo.spec:1.45
packages/gnome-web-photo/gnome-web-photo.spec:1.46
--- packages/gnome-web-photo/gnome-web-photo.spec:1.45 Sun Aug 1 15:12:10 2010
+++ packages/gnome-web-photo/gnome-web-photo.spec Tue Aug 24 00:35:59 2010
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): Narzędzie do generowania pełnowymiarowych plików
obrazów i miniaturek
Name: gnome-web-photo
Version: 0.9
-Release: 11
+Release: 12
License: GPL
Group: Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/0.9/%{name}-%{version}.tar.bz2
@@ -22,6 +22,7 @@
BuildRequires: libpng-devel
BuildRequires: libtool
BuildRequires: libxml2-devel >= 1:2.6.31
+BuildRequires: nspr-devel
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.198
BuildRequires: xulrunner-devel >= 1.9.2.3.6-1
@@ -32,6 +33,9 @@
# we have strict deps for it
%define _noautoreq libxpcom.so
+# libs passed in wrong order (as needed reaches before libs)
+%define filterout_ld -Wl,--as-needed
+
%description
GNOME Web Photographer is a tool to generate full-size image files and
thumbnails from HTML files and web pages.
@@ -90,6 +94,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.46 2010/08/23 22:35:59 glen
+- fix --no-copy-dt-needed-entries linking (add nspr libs)
+- --as-needed still needs a fix, filtered out for now; rel 12
+
Revision 1.45 2010/08/01 13:12:10 arekm
- release 11
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-web-photo/gnome-web-photo-libxul.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-web-photo/gnome-web-photo.spec?r1=1.45&r2=1.46&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
