OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Apr-2005 19:57:19
Branch: HEAD Handle: 2005042018571702
Modified files:
openpkg-src/ethereal ethereal.spec
openpkg-src/gimp gimp.spec
openpkg-src/glibmm glibmm.spec
openpkg-src/gtk2 gtk2.spec
openpkg-src/gtkmm gtkmm.spec
openpkg-src/pango pango.spec
openpkg-src/xrender xrender.spec
Log:
back out pkgconfig implicit dynamic library workaround now that we've
solved the problem within pkgconfig itself
Summary:
Revision Changes Path
1.54 +1 -4 openpkg-src/ethereal/ethereal.spec
1.71 +0 -3 openpkg-src/gimp/gimp.spec
1.8 +0 -3 openpkg-src/glibmm/glibmm.spec
1.51 +1 -3 openpkg-src/gtk2/gtk2.spec
1.4 +0 -3 openpkg-src/gtkmm/gtkmm.spec
1.43 +1 -4 openpkg-src/pango/pango.spec
1.17 +1 -3 openpkg-src/xrender/xrender.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 ethereal.spec
--- openpkg-src/ethereal/ethereal.spec 19 Apr 2005 17:09:06 -0000
1.53
+++ openpkg-src/ethereal/ethereal.spec 20 Apr 2005 17:57:17 -0000
1.54
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 0.10.10
-Release: 20050419
+Release: 20050420
# package options
%option with_zlib yes
@@ -97,9 +97,6 @@
-e 's;-all-static *;;g' \
-e 's;-static *;;g' \
Makefile.in
- %{l_shtool} subst \
- -e 's;\(PKG_CONFIG --libs\);\1 --static;g' \
- configure
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gimp/gimp.spec
============================================================================
$ cvs diff -u -r1.70 -r1.71 gimp.spec
--- openpkg-src/gimp/gimp.spec 20 Apr 2005 12:28:54 -0000 1.70
+++ openpkg-src/gimp/gimp.spec 20 Apr 2005 17:57:18 -0000 1.71
@@ -70,9 +70,6 @@
%prep
%setup -q
- %{l_shtool} subst \
- -e 's;\(PKG_CONFIG.*--libs\);\1 --static;g' \
- configure
%build
# configure program
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/glibmm/glibmm.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 glibmm.spec
--- openpkg-src/glibmm/glibmm.spec 20 Apr 2005 11:42:10 -0000 1.7
+++ openpkg-src/glibmm/glibmm.spec 20 Apr 2005 17:57:18 -0000 1.8
@@ -65,9 +65,6 @@
%prep
%setup -q
- %{l_shtool} subst \
- -e 's;\(PKG_CONFIG.*--libs\);\1 --static;' \
- configure
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gtk2/gtk2.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 gtk2.spec
--- openpkg-src/gtk2/gtk2.spec 20 Apr 2005 11:45:59 -0000 1.50
+++ openpkg-src/gtk2/gtk2.spec 20 Apr 2005 17:57:17 -0000 1.51
@@ -83,12 +83,10 @@
gtk/xdgmime/Makefile.in \
gdk/x11/Makefile.in
- # avoid searching for shared libraries,
- # and force pkg-config to provide static libs
+ # avoid searching for shared libraries
%{l_shtool} subst \
-e 's;echo eval echo \\\$export_dynamic_flag_spec;;g' \
-e 's;^\(LIBS="-lintl\)\ *\($LIBS"\);\1 -liconv \2;g' \
- -e 's;\(PKG_CONFIG.*--libs\);\1 --static;g' \
configure
# build binaries from static libraries
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gtkmm/gtkmm.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 gtkmm.spec
--- openpkg-src/gtkmm/gtkmm.spec 20 Apr 2005 12:30:25 -0000 1.3
+++ openpkg-src/gtkmm/gtkmm.spec 20 Apr 2005 17:57:19 -0000 1.4
@@ -73,9 +73,6 @@
-e 's;^\(SUBDIRS.*\)examples *;\1;g' \
-e 's;^\(SUBDIRS.*\)tests *;\1;g' \
Makefile.in
- %{l_shtool} subst \
- -e 's;\(PKG_CONFIG.*--libs\);\1 --static;' \
- configure
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 pango.spec
--- openpkg-src/pango/pango.spec 19 Apr 2005 16:40:45 -0000 1.42
+++ openpkg-src/pango/pango.spec 20 Apr 2005 17:57:17 -0000 1.43
@@ -38,7 +38,7 @@
Group: XWindow
License: GPL
Version: %{V_pango}
-Release: 20050419
+Release: 20050420
# list of sources
Source0:
ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.bz2
@@ -82,9 +82,6 @@
-e 's;\(pango_querymodules_LDFLAGS *=\);\1 -static;' \
Makefile.in */Makefile.in */*/Makefile.in \
pango\*.pc.in
- %{l_shtool} subst \
- -e 's;\(PKG_CONFIG.*--libs\);\1 --static;' \
- configure
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xrender/xrender.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 xrender.spec
--- openpkg-src/xrender/xrender.spec 20 Apr 2005 11:41:17 -0000 1.16
+++ openpkg-src/xrender/xrender.spec 20 Apr 2005 17:57:18 -0000 1.17
@@ -70,10 +70,8 @@
%setup -q -c
%setup -q -T -D -a 1
%{l_shtool} subst \
- -e 's;\(PKG_CONFIG.*--libs\);\1 --static;g' \
-e 's;echo \$RENDER_PKG_ERRORS;succeeded=yes;g' \
- libXrender-%{V_xrender}/configure \
- renderext-%{V_render}/configure
+ libXrender-%{V_xrender}/configure
%build
( cd renderext-%{V_render}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
