Hello community,
here is the log from the commit of package gtk1-compat-devel
checked in at Thu Jun 8 16:19:25 CEST 2006.
--------
--- GNOME/gtk1-compat-devel/gtk1-compat-devel.changes 2006-01-25 21:45:16.000000000 +0100
+++ gtk1-compat-devel/gtk1-compat-devel.changes 2006-06-08 16:11:46.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Jun 8 16:10:57 CEST 2006 - sbrabec@suse.cz
+
+- Added support for more *-config arguments.
+- Enabled support for all deprecated gtk2 functions.
+- Added support for libxml and libglade.
+- Force GTK2 objects in M4 files.
+- Added some wrapper header files.
+- Created a static library with removed or not exported functions.
+- Added gtk1-compat-autofix.
+
+-------------------------------------------------------------------
Old:
----
gtk.m4
New:
----
gdk-pixbuf-core.h
gdk-pixbuf-loader.h
glade-xml.h
gtk.h
gtk1-compat-autofix
gtk1-compat.c
gtk_m4.patch
gtkaccelgroup.h
gtkcompat.h
gtkenums.h
gtkfeatures.h
gtkpaned.h
gtktoolbar.h
libglade-config
libglade-xgettext
libglade.m4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtk1-compat-devel.spec ++++++
--- /var/tmp/diff_new_pack.pGDfKI/_old 2006-06-08 16:19:15.000000000 +0200
+++ /var/tmp/diff_new_pack.pGDfKI/_new 2006-06-08 16:19:15.000000000 +0200
@@ -1,42 +1,60 @@
#
# spec file for package gtk1-compat-devel (Version 0.1)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: gtk1-compat-devel
-BuildRequires: gnome-filesystem
+BuildRequires: gnome-filesystem gtk2-devel
Version: 0.1
-Release: 11
+Release: 24
Group: System/Libraries
License: LGPL
-Summary: Old Style Configuration Scripts for GLib, GTK+ and GDK-Pixbuf
-Source: glib-config
-Source1: gtk-config
-Source2: gdk-pixbuf-config
-# Copied from gtk and glib.
-Source3: gtk.m4
-Source4: glib.m4
-Source5: gdk-pixbuf.m4
+Summary: Compatibility Wrappers for Old Versions of GLib, GTK+, GDK-Pixbuf and libglade
+Source: gtk1-compat-autofix
+Source1: glib-config
+Source2: gtk-config
+Source3: gdk-pixbuf-config
+Source4: libglade-config
+Source10: gtkaccelgroup.h
+Source11: gtktoolbar.h
+Source12: gtkenums.h
+Source13: gtkfeatures.h
+Source14: gtk.h
+Source15: gtkcompat.h
+Source16: gtkpaned.h
+Source20: gdk-pixbuf-core.h
+Source21: gdk-pixbuf-loader.h
+Source30: glade-xml.h
+Source40: gtk1-compat.c
+# Copied from libglade-0.17.
+Source50: libglade-xgettext
+Source60: glib.m4
+Source61: gdk-pixbuf.m4
+Source62: libglade.m4
+Patch: gtk_m4.patch
Autoreqprov: on
-Requires: pkgconfig glib2-devel gtk2-devel
-Conflicts: glib-devel gtk-devel gdk-pixbuf-devel
+Requires: pkgconfig python glib2-devel gtk2-devel libxml2-devel libglade2-devel
+Conflicts: glib-devel gtk-devel gdk-pixbuf-devel libxml-devel libglade-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArchitectures: noarch
%description
-This micro-package contains glib-config, gtk-config and gd-pixbuf
-scripts and m4 macros, which simulate GLib1/GTK+1/GDK-Pixbuf1 config
-scripts, but tries to use GLib2/GTK+2.
-
-Using these scripts, you can force linking of some simple old
-applications with new libraries.
+Wrapper headers, M4 macros, config scripts and library symlinks, which
+simulate presence of GLib1, GTK+1, GDK-Pixbuf1, libglade1 development
+packages, but tries to use GLib2, GTK+2 and libglade2.
+
+Using it, you can force linking of some old applications with new
+libraries without any effort.
+
+Package also provides gtk1-compat-autofix script, which does some
+source code modifications, which cannot be worked around by any other
+way.
@@ -46,25 +64,65 @@
%prep
%setup -c -T
+cp -a %{S:40} .
+cp -a /opt/gnome/share/aclocal/gtk-2.0.m4 gtk.m4
+%patch
%build
+libtool --tag=CC --mode=compile gcc -Wall -O2 $RPM_OPT_FLAGS $(pkg-config --cflags gtk+-2.0) -c -o gtk1-compat.lo gtk1-compat.c
+libtool --tag=CC --mode=link gcc -o libgtk1-compat.a gtk1-compat.lo
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/opt/gnome/bin
-install %{S:0} %{S:1} %{S:2} $RPM_BUILD_ROOT/opt/gnome/bin
+install %{S:0} %{S:1} %{S:2} %{S:3} %{S:4} %{S:50} $RPM_BUILD_ROOT/opt/gnome/bin
+mkdir -p $RPM_BUILD_ROOT/opt/gnome/include/gtk1-compat/gtk
+install -m0644 %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} %{S:16} $RPM_BUILD_ROOT/opt/gnome/include/gtk1-compat/gtk
+mkdir -p $RPM_BUILD_ROOT/opt/gnome/include/gtk1-compat/gdk-pixbuf
+install -m0644 %{S:20} %{S:21} $RPM_BUILD_ROOT/opt/gnome/include/gtk1-compat/gdk-pixbuf
+mkdir -p $RPM_BUILD_ROOT/opt/gnome/include/gtk1-compat/glade
+install -m0644 %{S:30} $RPM_BUILD_ROOT/opt/gnome/include/gtk1-compat/glade
mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/aclocal
-install -m0644 %{S:3} %{S:4} %{S:5} $RPM_BUILD_ROOT/opt/gnome/share/aclocal
+install -m0644 gtk.m4 %{S:60} %{S:61} %{S:62} $RPM_BUILD_ROOT/opt/gnome/share/aclocal
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+( cd $RPM_BUILD_ROOT/usr/bin ; ln -s xml2-config xml-config )
+mkdir -p $RPM_BUILD_ROOT/opt/gnome/%_lib
+install -m0644 libgtk1-compat.a $RPM_BUILD_ROOT/opt/gnome/%_lib
+cd $RPM_BUILD_ROOT/opt/gnome/%_lib
+ln -s libgtk-x11-2.0.so libgtk.so
+ln -s libgtk-x11-2.0.la libgtk.la
+ln -s libgtk-x11-2.0.so libgdk-pixbuf.so
+ln -s libgtk-x11-2.0.la libgdk-pixbuf.la
+ln -s libglade-2.0.so libglade.so
+ln -s libglade-2.0.la libglade.la
+ln -s libglade-2.0.a libglade.a
+mkdir -p $RPM_BUILD_ROOT/usr/%_lib
+cd $RPM_BUILD_ROOT/usr/%_lib
+ln -s libxml2.so libxml.so
+ln -s libxml2.la libxml.la
+ln -s libxml2.a libxml.a
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr (-, root, root)
-/opt/gnome/bin/*-config
+/opt/gnome/bin/*
+/opt/gnome/include/gtk1-compat
/opt/gnome/share/aclocal/*.m4
+/usr/bin/*-config
+/usr/%_lib/*
+/opt/gnome/%_lib/*
%changelog -n gtk1-compat-devel
+* Thu Jun 08 2006 - sbrabec@suse.cz
+- Added support for more *-config arguments.
+- Enabled support for all deprecated gtk2 functions.
+- Added support for libxml and libglade.
+- Force GTK2 objects in M4 files.
+- Added some wrapper header files.
+- Created a static library with removed or not exported functions.
+- Added gtk1-compat-autofix.
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Sep 29 2005 - sbrabec@suse.cz
++++++ gdk-pixbuf-config ++++++
--- GNOME/gtk1-compat-devel/gdk-pixbuf-config 2005-09-29 14:03:12.000000000 +0200
+++ gtk1-compat-devel/gdk-pixbuf-config 2006-05-31 12:28:45.000000000 +0200
@@ -26,6 +26,58 @@
args[${#args[@]}]=--modversion
CMD='pkg-config gdk-pixbuf-2.0 "${args[@]}" | tail -n 1'
;;
+ --cflags )
+ echo -n "-DGTK_ENABLE_BROKEN -I/opt/gnome/include/gtk1-compat "
+ args[${#args[@]}]=$arg
+ ;;
+ * )
+ args[${#args[@]}]=$arg
+ ;;
+ esac
+done
+#echo -e >&2 "\n*** gtk1-compat simulation: ***"
+#echo >&2 "Command: gtk-config $*"
+#eval echo >&2 "Replaced by: $CMD"
+
+eval $CMD
+#! /bin/bash
+
+# Copyright (C) 2005 Stanislav Brabec , SuSE CR
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# (LGPL) version 2.1
+#
+# See http://www.gnu.org/copyleft/lesser.html
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+declare -a args
+CMD='exec pkg-config gtk+-2.0 "${args[@]}"'
+for arg in "$@" ; do
+ case "$arg" in
+ gtk | gdk-pixbuf )
+ args[${#args[@]}]="$arg-2.0"
+ ;;
+ glib | gmodule | gthread )
+ unset args[${#args[@]}]
+ ;;
+ --prefix )
+ args[${#args[@]}]=--variable=prefix
+ ;;
+ --exec-prefix )
+ args[${#args[@]}]=--variable=exec_prefix
+ ;;
+ --version )
+ args[${#args[@]}]=--modversion
+ CMD='pkg-config gtk+-2.0 "${args[@]}" | tail -n 1'
+ ;;
+ --cflags )
+ echo -n "-DGTK_ENABLE_BROKEN -I/opt/gnome/include/gtk1-compat "
+ args[${#args[@]}]=$arg
+ ;;
* )
args[${#args[@]}]=$arg
;;
++++++ gdk-pixbuf.m4 ++++++
--- GNOME/gtk1-compat-devel/gdk-pixbuf.m4 2005-09-26 18:47:57.000000000 +0200
+++ gtk1-compat-devel/gdk-pixbuf.m4 2006-05-31 15:07:02.000000000 +0200
@@ -1,166 +1,8 @@
-# Configure paths for gdk-pixbuf
-# Elliot Lee 2000-01-10
-# stolen from Raph Levien 98-11-18
-# stolen from Manish Singh 98-9-30
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS
-dnl
AC_DEFUN([AM_PATH_GDK_PIXBUF],
-[dnl
-dnl Get the cflags and libraries from the gdk-pixbuf-config script
-dnl
-AC_ARG_WITH(gdk-pixbuf-prefix,[ --with-gdk-pixbuf-prefix=PFX Prefix where GDK_PIXBUF is installed (optional)],
- gdk_pixbuf_prefix="$withval", gdk_pixbuf_prefix="")
-AC_ARG_WITH(gdk-pixbuf-exec-prefix,[ --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)],
- gdk_pixbuf_exec_prefix="$withval", gdk_pixbuf_exec_prefix="")
-AC_ARG_ENABLE(gdk_pixbuftest, [ --disable-gdk_pixbuftest Do not try to compile and run a test GDK_PIXBUF program],
- , enable_gdk_pixbuftest=yes)
-
- if test x$gdk_pixbuf_exec_prefix != x ; then
- gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix"
- if test x${GDK_PIXBUF_CONFIG+set} = xset ; then
- GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config
- fi
- fi
- if test x$gdk_pixbuf_prefix != x ; then
- gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix"
- if test x${GDK_PIXBUF_CONFIG+set} = xset ; then
- GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config
- fi
- fi
-
- AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no)
- min_gdk_pixbuf_version=ifelse([$1], ,0.2.5,$1)
- AC_MSG_CHECKING(for GDK_PIXBUF - version >= $min_gdk_pixbuf_version)
- no_gdk_pixbuf=""
- if test "$GDK_PIXBUF_CONFIG" = "no" ; then
- no_gdk_pixbuf=yes
- else
- GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags`
- GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs`
-
- gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_gdk_pixbuftest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
- LIBS="$LIBS $GDK_PIXBUF_LIBS"
-dnl
-dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity
-dnl checks the results of gdk-pixbuf-config to some extent
-dnl
- rm -f conf.gdk_pixbuftest
- AC_TRY_RUN([
-#include
-#include
-#include
-#include
-
-char*
-my_strdup (char *str)
-{
- char *new_str;
-
- if (str)
- {
- new_str = malloc ((strlen (str) + 1) * sizeof(char));
- strcpy (new_str, str);
- }
- else
- new_str = NULL;
-
- return new_str;
-}
-
-int main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.gdk_pixbuftest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = my_strdup("$min_gdk_pixbuf_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_gdk_pixbuf_version");
- exit(1);
- }
-
- if (($gdk_pixbuf_major_version > major) ||
- (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) ||
- (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version);
- printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n");
- printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_gdk_pixbuf" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$GDK_PIXBUF_CONFIG" = "no" ; then
- echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found"
- echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the"
- echo "*** full path to gdk-pixbuf-config."
- else
- if test -f conf.gdk_pixbuftest ; then
- :
- else
- echo "*** Could not run GDK_PIXBUF test program, checking why..."
- CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
- LIBS="$LIBS $GDK_PIXBUF_LIBS"
- AC_TRY_LINK([
-#include
-#include
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong"
- echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed"
- echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you"
- echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GDK_PIXBUF_CFLAGS=""
- GDK_PIXBUF_LIBS=""
- ifelse([$3], , :, [$3])
- fi
+[dnl
+ AM_PATH_GTK(,[$2],[$3],[gdk-pixbuf-2.0])
+ GDK_PIXBUF_CFLAGS="$GTK_CFLAGS"
+ GDK_PIXBUF_LIBS="$GTK_LIBS"
AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS)
- rm -f conf.gdk_pixbuftest
])
++++++ glib-config ++++++
--- GNOME/gtk1-compat-devel/glib-config 2005-09-29 14:00:44.000000000 +0200
+++ gtk1-compat-devel/glib-config 2006-05-30 16:12:14.000000000 +0200
@@ -19,6 +19,12 @@
glib | gmodule | gthread )
args[${#args[@]}]="$arg-2.0"
;;
+ --prefix )
+ args[${#args[@]}]=--variable=prefix
+ ;;
+ --exec-prefix )
+ args[${#args[@]}]=--variable=exec_prefix
+ ;;
--version )
args[${#args[@]}]=--modversion
CMD='pkg-config glib-2.0 "${args[@]}" | tail -n 1'
++++++ glib.m4 ++++++
--- GNOME/gtk1-compat-devel/glib.m4 2005-09-26 14:42:42.000000000 +0200
+++ gtk1-compat-devel/glib.m4 2006-05-31 14:12:43.000000000 +0200
@@ -1,196 +1,4 @@
-# Configure paths for GLIB
-# Owen Taylor 97-11-3
-
-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
-dnl gthread is specified in MODULES, pass to glib-config
-dnl
AC_DEFUN([AM_PATH_GLIB],
[dnl
-dnl Get the cflags and libraries from the glib-config script
-dnl
-AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
- glib_config_prefix="$withval", glib_config_prefix="")
-AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
- glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
- , enable_glibtest=yes)
-
- if test x$glib_config_exec_prefix != x ; then
- glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
- if test x${GLIB_CONFIG+set} != xset ; then
- GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
- fi
- fi
- if test x$glib_config_prefix != x ; then
- glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
- if test x${GLIB_CONFIG+set} != xset ; then
- GLIB_CONFIG=$glib_config_prefix/bin/glib-config
- fi
- fi
-
- for module in . $4
- do
- case "$module" in
- gmodule)
- glib_config_args="$glib_config_args gmodule"
- ;;
- gthread)
- glib_config_args="$glib_config_args gthread"
- ;;
- esac
- done
-
- AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
- min_glib_version=ifelse([$1], ,0.99.7,$1)
- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
- no_glib=""
- if test "$GLIB_CONFIG" = "no" ; then
- no_glib=yes
- else
- GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
- GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
- glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_glibtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config to some extent
-dnl
- rm -f conf.glibtest
- AC_TRY_RUN([
-#include
-#include
-#include
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.glibtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_glib_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_glib_version");
- exit(1);
- }
-
- if ((glib_major_version != $glib_config_major_version) ||
- (glib_minor_version != $glib_config_minor_version) ||
- (glib_micro_version != $glib_config_micro_version))
- {
- printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version);
- printf ("*** was found! If glib-config was correct, then it is best\n");
- printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
- printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
- printf("*** before re-running configure\n");
- }
- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
- (glib_minor_version != GLIB_MINOR_VERSION) ||
- (glib_micro_version != GLIB_MICRO_VERSION))
- {
- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- glib_major_version, glib_minor_version, glib_micro_version);
- }
- else
- {
- if ((glib_major_version > major) ||
- ((glib_major_version == major) && (glib_minor_version > minor)) ||
- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
- glib_major_version, glib_minor_version, glib_micro_version);
- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the glib-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
- printf("*** correct copy of glib-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_glib" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$GLIB_CONFIG" = "no" ; then
- echo "*** The glib-config script installed by GLIB could not be found"
- echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the GLIB_CONFIG environment variable to the"
- echo "*** full path to glib-config."
- else
- if test -f conf.glibtest ; then
- :
- else
- echo "*** Could not run GLIB test program, checking why..."
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$LIBS $GLIB_LIBS"
- AC_TRY_LINK([
-#include
-#include
-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
- echo "***"
- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
- echo "*** came with the system with the command"
- echo "***"
- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
- echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
- echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GLIB_CFLAGS=""
- GLIB_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- rm -f conf.glibtest
+ AM_PATH_GLIB_2_0(,[$2],[$3])
])
++++++ gtk-config ++++++
--- GNOME/gtk1-compat-devel/gtk-config 2005-09-29 14:02:44.000000000 +0200
+++ gtk1-compat-devel/gtk-config 2006-06-05 16:28:43.000000000 +0200
@@ -14,6 +14,7 @@
declare -a args
CMD='exec pkg-config gtk+-2.0 "${args[@]}"'
+LIBS_USED=false
for arg in "$@" ; do
case "$arg" in
gtk | gdk-pixbuf )
@@ -22,10 +23,30 @@
glib | gmodule | gthread )
unset args[${#args[@]}]
;;
+ --prefix )
+ args[${#args[@]}]=--variable=prefix
+ ;;
+ --exec-prefix )
+ args[${#args[@]}]=--variable=exec_prefix
+ ;;
--version )
args[${#args[@]}]=--modversion
CMD='pkg-config gtk+-2.0 "${args[@]}" | tail -n 1'
;;
+ --cflags )
+ echo -n "-DGTK_ENABLE_BROKEN -I/opt/gnome/include/gtk1-compat "
+ args[${#args[@]}]=$arg
+ if test "$GTK1_COMPAT_THREAD_SUPPORT" ; then
+ args[${#args[@]}]="gthread-2.0"
+ fi
+ ;;
+ --libs )
+ LIBS_USED=true
+ args[${#args[@]}]=$arg
+ if test "$GTK1_COMPAT_THREAD_SUPPORT" ; then
+ args[${#args[@]}]="gthread-2.0"
+ fi
+ ;;
* )
args[${#args[@]}]=$arg
;;
@@ -35,4 +56,8 @@
#echo >&2 "Command: gtk-config $*"
#eval echo >&2 "Replaced by: $CMD"
-eval $CMD
+if $LIBS_USED ; then
+ echo "$(eval $CMD) -lgtk1-compat"
+else
+ eval $CMD
+fi
++++++ gtk_m4.patch ++++++
--- gtk.m4
+++ gtk.m4
@@ -1,11 +1,11 @@
# Configure paths for GTK+
# Owen Taylor 1997-2001
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
dnl pass to pkg-config
dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
+AC_DEFUN([AM_PATH_GTK],
[dnl
dnl Get the cflags and libraries from pkg-config
dnl
@@ -56,8 +56,8 @@
fi
if test x"$no_gtk" = x ; then
- GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
- GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+ GTK_CFLAGS="-DGTK_ENABLE_BROKEN -I/opt/gnome/include/gtk1-compat `$PKG_CONFIG $pkg_config_args --cflags`"
+ GTK_LIBS="`$PKG_CONFIG $pkg_config_args --libs` -lgtk1-compat"
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org