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: 19-Apr-2005 18:42:04
Branch: HEAD Handle: 2005041917420400
Modified files:
openpkg-src/gtk2 gtk2.spec
Log:
correct broken assumed dynamic library configuration by hardcoding
static library requirements into buildconf
Summary:
Revision Changes Path
1.49 +6 -4 openpkg-src/gtk2/gtk2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gtk2/gtk2.spec
============================================================================
$ cvs diff -u -r1.48 -r1.49 gtk2.spec
--- openpkg-src/gtk2/gtk2.spec 15 Apr 2005 07:03:28 -0000 1.48
+++ openpkg-src/gtk2/gtk2.spec 19 Apr 2005 16:42:04 -0000 1.49
@@ -40,7 +40,7 @@
Group: XWindow
License: GPL
Version: %{V_gtk}
-Release: 20050415
+Release: 20050419
# list of sources
Source0: ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{V_gtk}.tar.gz
@@ -50,8 +50,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: X11, png, jpeg, tiff, gettext, pkgconfig >= 0.14.0, make
-PreReq: X11, png, jpeg, tiff, gettext, pkgconfig >= 0.14.0
+BuildPreReq: X11, png, jpeg, tiff, gettext, pango, pkgconfig >= 0.14.0, make
+PreReq: X11, png, jpeg, tiff, gettext, pango, pkgconfig >= 0.14.0
BuildPreReq: glib2 >= %{V_glib_major}, pango >= %{V_pango_major}, atk >=
%{V_atk_major}
PreReq: glib2 >= %{V_glib_major}, pango >= %{V_pango_major}, atk >=
%{V_atk_major}
AutoReq: no
@@ -83,10 +83,12 @@
gtk/xdgmime/Makefile.in \
gdk/x11/Makefile.in
- # avoid searching for shared libraries
+ # avoid searching for shared libraries,
+ # and force pkg-config to provide static libs
%{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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
