pool/glib2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=37

Browse Source
This commit is contained in:
OBS User unknown 2008-05-06 16:32:45 +00:00 committed by Git OBS Bridge
parent f68bf229f2
commit dcc5654eba
4 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
glib2-libtool.diff
View File

@ -1,40 +1,10 @@
--- configure.in
+++ configure.in
@@ -1272,7 +1272,11 @@ if test x"$glib_native_win32" = xyes; th
G_MODULE_LDFLAGS=
else
export SED
+ if test -x libtool; then
G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ else
+ G_MODULE_LDFLAGS=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
@@ -1261,6 +1261,7 @@ if test "x$glib_cv_va_val_copy" = "xno";
AC_DEFINE(G_VA_COPY_AS_ARRAY,1, ['va_lists' cannot be copies as values])
fi
dnl G_MODULE_IMPL= don't reset, so cmd-line can override
G_MODULE_NEED_USCORE=0
@@ -1337,8 +1341,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
echo "void glib_plugin_test(void) { }" > plugin.c
+ if test -x libtool; then
${SHELL} ./libtool --mode=compile ${CC} -shared \
-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ else
+ libtool --mode=compile ${CC} -shared \
+ -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ fi
AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
glib_cv_rtldglobal_broken,[
AC_TRY_RUN([
@@ -1411,7 +1420,11 @@ fi
AC_MSG_CHECKING(for the suffix of shared libraries)
export SED
+if test -x libtool; then
shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
+else
+shrext_cmds=`libtool --config | grep '^shrext_cmds='`
+fi
eval $shrext_cmds
module=yes eval std_shrext=$shrext_cmds
# chop the initial dot
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
dnl ***********************
dnl *** g_module checks ***
dnl ***********************

2
glib2-upstream-gnome_defaults.conf
View File

@ -41,3 +41,5 @@ evince.desktop
gedit.desktop
file-roller.desktop
epiphany.desktop
# evince supports multi-page tiff, but most people will prefer eog:
image/tiff=eog.desktop

11
glib2.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue May 6 14:38:38 CEST 2008 - schwab@suse.de
- Don't use libtool before it is created.
-------------------------------------------------------------------
Mon May 5 14:48:22 CEST 2008 - sbrabec@suse.cz
- Prefer eog over evince for image/tiff in gnome_defaults
(bnc#346517).
-------------------------------------------------------------------
Thu May 1 12:52:01 CEST 2008 - vuntz@suse.de

7
glib2.spec
View File

@ -18,7 +18,7 @@ License: LGPL v2.1 or later
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: 2.16.3
Release: 10
Release: 12
Summary: A Library with Convenient Functions Written in C
Url: http://www.gtk.org/
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
@ -505,6 +505,11 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/gtk-doc/html
%changelog
* Tue May 06 2008 schwab@suse.de
- Don't use libtool before it is created.
* Mon May 05 2008 sbrabec@suse.cz
- Prefer eog over evince for image/tiff in gnome_defaults
(bnc#346517).
* Thu May 01 2008 vuntz@suse.de
- Add glib2-bnc379332-desktop-su.patch to launch .desktop files as
root when X-KDE-SubstituteUID and X-KDE-RootOnly are there.