Hello community,
here is the log from the commit of package gtk1-compat-devel
checked in at Fri Jun 9 02:14:11 CEST 2006.
--------
--- GNOME/gtk1-compat-devel/gtk1-compat-devel.changes 2006-06-08 16:11:46.000000000 +0200
+++ gtk1-compat-devel/gtk1-compat-devel.changes 2006-06-08 18:57:43.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 8 18:56:07 CEST 2006 - sbrabec@suse.cz
+
+- Added GTK1_COMPAT_DISABLE_C_SUPPORT to disable C wrappers.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtk1-compat-devel.spec ++++++
--- /var/tmp/diff_new_pack.7RxGcd/_old 2006-06-09 02:02:27.000000000 +0200
+++ /var/tmp/diff_new_pack.7RxGcd/_new 2006-06-09 02:02:27.000000000 +0200
@@ -13,7 +13,7 @@
Name: gtk1-compat-devel
BuildRequires: gnome-filesystem gtk2-devel
Version: 0.1
-Release: 24
+Release: 25
Group: System/Libraries
License: LGPL
Summary: Compatibility Wrappers for Old Versions of GLib, GTK+, GDK-Pixbuf and libglade
@@ -116,6 +116,8 @@
%changelog -n gtk1-compat-devel
* Thu Jun 08 2006 - sbrabec@suse.cz
+- Added GTK1_COMPAT_DISABLE_C_SUPPORT to disable C wrappers.
+* 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.
++++++ gdk-pixbuf-config ++++++
--- GNOME/gtk1-compat-devel/gdk-pixbuf-config 2006-05-31 12:28:45.000000000 +0200
+++ gtk1-compat-devel/gdk-pixbuf-config 2006-06-08 18:52:08.000000000 +0200
@@ -27,55 +27,9 @@
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 "
+ if test -z "$GTK1_COMPAT_DISABLE_C_SUPPORT" ; then
+ echo -n "-DGTK_ENABLE_BROKEN -I/opt/gnome/include/gtk1-compat "
+ fi
args[${#args[@]}]=$arg
;;
* )
++++++ gtk-config ++++++
--- GNOME/gtk1-compat-devel/gtk-config 2006-06-05 16:28:43.000000000 +0200
+++ gtk1-compat-devel/gtk-config 2006-06-08 18:50:51.000000000 +0200
@@ -34,7 +34,9 @@
CMD='pkg-config gtk+-2.0 "${args[@]}" | tail -n 1'
;;
--cflags )
- echo -n "-DGTK_ENABLE_BROKEN -I/opt/gnome/include/gtk1-compat "
+ if test -z "$GTK1_COMPAT_DISABLE_C_SUPPORT" ; then
+ echo -n "-DGTK_ENABLE_BROKEN -I/opt/gnome/include/gtk1-compat "
+ fi
args[${#args[@]}]=$arg
if test "$GTK1_COMPAT_THREAD_SUPPORT" ; then
args[${#args[@]}]="gthread-2.0"
@@ -57,7 +59,11 @@
#eval echo >&2 "Replaced by: $CMD"
if $LIBS_USED ; then
- echo "$(eval $CMD) -lgtk1-compat"
+ if test -z "$GTK1_COMPAT_DISABLE_C_SUPPORT" ; then
+ echo "$(eval $CMD) -lgtk1-compat"
+ else
+ eval $CMD
+ fi
else
eval $CMD
fi
++++++ gtk_m4.patch ++++++
--- /var/tmp/diff_new_pack.7RxGcd/_old 2006-06-09 02:02:27.000000000 +0200
+++ /var/tmp/diff_new_pack.7RxGcd/_new 2006-06-09 02:02:27.000000000 +0200
@@ -14,14 +14,19 @@
[dnl
dnl Get the cflags and libraries from pkg-config
dnl
-@@ -56,8 +56,8 @@
+@@ -56,8 +56,13 @@
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"
++ if test -z "$GTK1_COMPAT_DISABLE_C_SUPPORT" ; then
++ 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"
++ else
++ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
++ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
++ fi
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 | \
++++++ libglade-config ++++++
--- GNOME/gtk1-compat-devel/libglade-config 2006-05-31 12:03:27.000000000 +0200
+++ gtk1-compat-devel/libglade-config 2006-06-08 18:51:22.000000000 +0200
@@ -27,7 +27,9 @@
CMD='pkg-config libglade-2.0 "${args[@]}" | tail -n 1'
;;
--cflags )
- echo -n "-I/opt/gnome/include/gtk1-compat "
+ if test -z "$GTK1_COMPAT_DISABLE_C_SUPPORT" ; then
+ echo -n "-I/opt/gnome/include/gtk1-compat "
+ fi
args[${#args[@]}]=$arg
;;
--check )
++++++ libglade.m4 ++++++
--- GNOME/gtk1-compat-devel/libglade.m4 2006-05-31 14:24:12.000000000 +0200
+++ gtk1-compat-devel/libglade.m4 2006-06-08 18:53:35.000000000 +0200
@@ -1,6 +1,10 @@
AC_DEFUN([AM_PATH_LIBGLADE],
[dnl
PKG_CHECK_MODULES([LIBGLADE2],[libglade-2.0],[$1],[$2],[$3])
- LIBGLADE_CFLAGS="-I/opt/gnome/include/gtk1-compat $LIBGLADE2_CFLAGS"
+ if test -z "$GTK1_COMPAT_DISABLE_C_SUPPORT" ; then
+ LIBGLADE_CFLAGS="-I/opt/gnome/include/gtk1-compat $LIBGLADE2_CFLAGS"
+ else
+ LIBGLADE_CFLAGS="$LIBGLADE2_CFLAGS"
+ fi
LIBGLADE_LIBS="$LIBGLADE2_LIBS"
])
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org