[Pkg-xfce-commits] r490 - in goodies/xfce4-terminal/debian: .
patches
Yves-Alexis Perez
corsac-guest at costa.debian.org
Mon Mar 6 22:42:46 UTC 2006
Author: corsac-guest
Date: 2006-03-06 22:42:45 +0000 (Mon, 06 Mar 2006)
New Revision: 490
Added:
goodies/xfce4-terminal/debian/patches/04_benny-fix-build-with-exo-svn.patch
Removed:
goodies/xfce4-terminal/debian/patches/02_fix-build-with-exo.patch
goodies/xfce4-terminal/debian/patches/03_fix_implicit_func_def.patch
Modified:
goodies/xfce4-terminal/debian/changelog
Log:
added benny's patch to build against latest libexo (and removed our patches)
Modified: goodies/xfce4-terminal/debian/changelog
===================================================================
--- goodies/xfce4-terminal/debian/changelog 2006-03-06 22:41:18 UTC (rev 489)
+++ goodies/xfce4-terminal/debian/changelog 2006-03-06 22:42:45 UTC (rev 490)
@@ -1,3 +1,11 @@
+xfce4-terminal (0.2.4-6) UNRELEASED; urgency=low
+
+ * debian/patches
+ - removed patches wich fixed build with exo 0.3.1.2alpha-r19548
+ - added upstream patch wich fix build with exo 0.3.1.4alpha2-r20235
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Mon, 06 Mar 2006 17:53:29 +0100
+
xfce4-terminal (0.2.4-5) unstable; urgency=low
* (Yves-Alexis Perez)
Deleted: goodies/xfce4-terminal/debian/patches/02_fix-build-with-exo.patch
===================================================================
--- goodies/xfce4-terminal/debian/patches/02_fix-build-with-exo.patch 2006-03-06 22:41:18 UTC (rev 489)
+++ goodies/xfce4-terminal/debian/patches/02_fix-build-with-exo.patch 2006-03-06 22:42:45 UTC (rev 490)
@@ -1,46 +0,0 @@
-diff -pruN terminal.old/Makefile.in terminal/Makefile.in
---- terminal.old/Makefile.in 2005-03-19 20:31:20.000000000 +0100
-+++ terminal/Makefile.in 2005-12-20 12:33:54.000000000 +0100
-@@ -349,6 +349,7 @@ Terminal_LDFLAGS = \
- -no-undefined \
- $(DBUS_LIBS) \
- $(EXO_LIBS) \
-+ /usr/lib/libxfcegui4.so \
- $(LIBSTARTUP_NOTIFICATION_LIBS) \
- $(VTE_LIBS)
-
-diff -pruN terminal.old/terminal-screen.c terminal/terminal-screen.c
---- terminal.old/terminal-screen.c 2005-03-13 17:06:38.000000000 +0100
-+++ terminal/terminal-screen.c 2005-12-20 12:28:41.000000000 +0100
-@@ -37,6 +37,8 @@
- #include <unistd.h>
- #endif
-
-+#include <gdk/gdk.h>
-+#include <gdk/gdkx.h>
- #include <exo/exo.h>
-
- #include <terminal/terminal-enum-types.h>
-diff -pruN terminal.old/terminal-shortcut-editor.c terminal/terminal-shortcut-editor.c
---- terminal.old/terminal-shortcut-editor.c 2005-01-31 00:49:43.000000000 +0100
-+++ terminal/terminal-shortcut-editor.c 2005-12-20 12:19:56.000000000 +0100
-@@ -26,6 +26,7 @@
- #endif
-
- #include <gdk/gdkkeysyms.h>
-+#include <gdk/gdkx.h>
-
- #include <terminal/terminal-preferences.h>
- #include <terminal/terminal-shortcut-editor.h>
-diff -pruN terminal.old/terminal-window.c terminal/terminal-window.c
---- terminal.old/terminal-window.c 2005-03-17 10:18:58.000000000 +0100
-+++ terminal/terminal-window.c 2005-12-20 12:26:41.000000000 +0100
-@@ -37,6 +37,8 @@
- #include <unistd.h>
- #endif
-
-+#include <libxfcegui4/libxfcegui4.h>
-+
- #include <exo/exo.h>
-
- #include <gdk/gdkkeysyms.h>
Deleted: goodies/xfce4-terminal/debian/patches/03_fix_implicit_func_def.patch
===================================================================
--- goodies/xfce4-terminal/debian/patches/03_fix_implicit_func_def.patch 2006-03-06 22:41:18 UTC (rev 489)
+++ goodies/xfce4-terminal/debian/patches/03_fix_implicit_func_def.patch 2006-03-06 22:42:45 UTC (rev 490)
@@ -1,12 +0,0 @@
---- terminal.old/terminal-helper.c 2005-03-13 17:38:19.000000000 -0700
-+++ terminal/terminal-helper.c 2006-01-03 14:26:48.000000000 -0700
-@@ -33,6 +33,8 @@
- #include <string.h>
- #endif
-
-+#include <libxfcegui4/libxfcegui4.h>
-+
- #include <exo/exo.h>
-
- #include <terminal/terminal-enum-types.h>
-
Added: goodies/xfce4-terminal/debian/patches/04_benny-fix-build-with-exo-svn.patch
===================================================================
--- goodies/xfce4-terminal/debian/patches/04_benny-fix-build-with-exo-svn.patch 2006-03-06 22:41:18 UTC (rev 489)
+++ goodies/xfce4-terminal/debian/patches/04_benny-fix-build-with-exo-svn.patch 2006-03-06 22:42:45 UTC (rev 490)
@@ -0,0 +1,511 @@
+diff -aur ../Terminal-0.2.4-orig/Makefile.in ./Makefile.in
+--- ../Terminal-0.2.4-orig/Makefile.in Sat Mar 19 20:31:20 2005
++++ ./Makefile.in Mon Mar 6 17:05:39 2006
+@@ -178,6 +178,10 @@
+ LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+ LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@
+ LIBTOOL = @LIBTOOL@
++LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
++LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
++LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
++LIBXFCEGUI4_VERSION = @LIBXFCEGUI4_VERSION@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+diff -aur ../Terminal-0.2.4-orig/configure ./configure
+--- ../Terminal-0.2.4-orig/configure Sat Mar 19 20:31:21 2005
++++ ./configure Mon Mar 6 17:03:01 2006
+@@ -470,7 +470,7 @@
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT TERMINAL_VERSION_DBUS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir XGETTEXT_ARGS PKG_CONFIG EXO_VERSION EXO_CFLAGS EXO_LIBS EXO_REQUIRED_VERSION VTE_VERSION VTE_CFLAGS VTE_LIBS VTE_REQUIRED_VERSION LIBSTARTUP_NOTIFICATION_VERSION LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION HAVE_LIBSTARTUP_NOTIFICATION_TRUE HAVE_LIBSTARTUP_NOTIFICATION_FALSE DBUS_VERSION DBUS_CFLAGS DBUS_LIBS DBUS_REQUIRED_VERSION HAVE_DBUS_TRUE HAVE_DBUS_FALSE XSLTPROC ENABLE_XSLTPROC_TRUE ENABLE_XSLTPROC_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT TERMINAL_VERSION_DBUS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir XGETTEXT_ARGS PKG_CONFIG EXO_VERSION EXO_CFLAGS EXO_LIBS EXO_REQUIRED_VERSION LIBXFCEGUI4_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION VTE_VERSION VTE_CFLAGS VTE_LIBS VTE_REQUIRED_VERSION LIBSTARTUP_NOTIFICATION_VERSION LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION HAVE_LIBSTARTUP_NOTIFICATION_TRUE HAVE_LIBSTARTUP_NOTIFICATION_FALSE DBUS_VERSION DBUS_CFLAGS DBUS_LIBS DBUS_REQUIRED_VERSION HAVE_DBUS_TRUE HAVE_DBUS_FALSE XSLTPROC ENABLE_XSLTPROC_TRUE ENABLE_XSLTPROC_FALSE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -22644,6 +22644,143 @@
+ fi
+
+
++ echo "$as_me:$LINENO: checking for libxfcegui4-1.0 >= 4.2.0" >&5
++echo $ECHO_N "checking for libxfcegui4-1.0 >= 4.2.0... $ECHO_C" >&6
++ if $PKG_CONFIG "--atleast-version=4.2.0" "libxfcegui4-1.0" >/dev/null 2>&1; then
++ LIBXFCEGUI4_VERSION=`$PKG_CONFIG --modversion "libxfcegui4-1.0"`
++ echo "$as_me:$LINENO: result: $LIBXFCEGUI4_VERSION" >&5
++echo "${ECHO_T}$LIBXFCEGUI4_VERSION" >&6
++
++ echo "$as_me:$LINENO: checking LIBXFCEGUI4_CFLAGS" >&5
++echo $ECHO_N "checking LIBXFCEGUI4_CFLAGS... $ECHO_C" >&6
++ LIBXFCEGUI4_CFLAGS=`$PKG_CONFIG --cflags "libxfcegui4-1.0"`
++ echo "$as_me:$LINENO: result: $LIBXFCEGUI4_CFLAGS" >&5
++echo "${ECHO_T}$LIBXFCEGUI4_CFLAGS" >&6
++
++ echo "$as_me:$LINENO: checking LIBXFCEGUI4_LIBS" >&5
++echo $ECHO_N "checking LIBXFCEGUI4_LIBS... $ECHO_C" >&6
++ LIBXFCEGUI4_LIBS=`$PKG_CONFIG --libs "libxfcegui4-1.0"`
++ echo "$as_me:$LINENO: result: $LIBXFCEGUI4_LIBS" >&5
++echo "${ECHO_T}$LIBXFCEGUI4_LIBS" >&6
++
++ LIBXFCEGUI4_REQUIRED_VERSION=4.2.0
++
++
++
++
++
++
++
++ elif $PKG_CONFIG --exists "libxfcegui4-1.0" >/dev/null 2>&1; then
++ xdg_cv_version=`$PKG_CONFIG --modversion "libxfcegui4-1.0"`
++ echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
++echo "${ECHO_T}found, but $xdt_cv_version" >&6
++
++
++ echo "*** The required package libxfcegui4-1.0 was found on your system,"
++ echo "*** but the installed version ($xdt_cv_version) is too old."
++ echo "*** Please upgrade libxfcegui4-1.0 to atleast version 4.2.0, or adjust"
++ echo "*** the PKG_CONFIG_PATH environment variable if you installed"
++ echo "*** the new version of the package in a nonstandard prefix so"
++ echo "*** pkg-config is able to find it."
++ exit 1
++
++ else
++ echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6
++
++
++ echo "*** The required package libxfcegui4-1.0 was not found on your system."
++ echo "*** Please install libxfcegui4-1.0 (atleast version 4.2.0) or adjust"
++ echo "*** the PKG_CONFIG_PATH environment variable if you"
++ echo "*** installed the package in a nonstandard prefix so that"
++ echo "*** pkg-config is able to find it."
++ exit 1
++
++ fi
++
++
++
++ # minimum supported version of pkg-config
++ xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
++
++ # lookup pkg-config utility
++ if test x"$PKG_CONFIG" = x""; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
++if test -n "$PKG_CONFIG"; then
++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++ if test x"$PKG_CONFIG" = x"no"; then
++ echo "*** The pkg-config utility could not be found on your system."
++ echo "*** Make sure it is in your path, or set the PKG_CONFIG"
++ echo "*** environment variable to the full path to pkg-config."
++ echo "*** You can download pkg-config from the freedesktop.org"
++ echo "*** software repository at"
++ echo "***"
++ echo "*** http://www.freedesktop.org/software/pkgconfig"
++ echo "***"
++ exit 1
++ fi
++
++ # check pkg-config version
++ echo "$as_me:$LINENO: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5
++echo $ECHO_N "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... $ECHO_C" >&6
++ if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
++ xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
++ echo "$as_me:$LINENO: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
++echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6
++ else
++ xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
++ echo "$as_me:$LINENO: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
++echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6
++ echo "*** Your version of pkg-config is too old. You need atleast"
++ echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
++ echo "*** from the freedesktop.org software repository at"
++ echo "***"
++ echo "*** http://www.freedesktop.org/software/pkgconfig"
++ echo "***"
++ exit 1
++ fi
++ fi
++
++
+ echo "$as_me:$LINENO: checking for vte >= 0.11.11" >&5
+ echo $ECHO_N "checking for vte >= 0.11.11... $ECHO_C" >&6
+ if $PKG_CONFIG "--atleast-version=0.11.11" "vte" >/dev/null 2>&1; then
+@@ -23164,7 +23301,6 @@
+
+
+ xdt_cv_additional_CFLAGS="-Wall"
+- xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -DG_DISABLE_DEPRECATED"
+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -DXFCE_DISABLE_DEPRECATED"
+
+ if test x"$enable_debug" = x"full"; then
+@@ -24106,6 +24242,10 @@
+ s, at EXO_CFLAGS@,$EXO_CFLAGS,;t t
+ s, at EXO_LIBS@,$EXO_LIBS,;t t
+ s, at EXO_REQUIRED_VERSION@,$EXO_REQUIRED_VERSION,;t t
++s, at LIBXFCEGUI4_VERSION@,$LIBXFCEGUI4_VERSION,;t t
++s, at LIBXFCEGUI4_CFLAGS@,$LIBXFCEGUI4_CFLAGS,;t t
++s, at LIBXFCEGUI4_LIBS@,$LIBXFCEGUI4_LIBS,;t t
++s, at LIBXFCEGUI4_REQUIRED_VERSION@,$LIBXFCEGUI4_REQUIRED_VERSION,;t t
+ s, at VTE_VERSION@,$VTE_VERSION,;t t
+ s, at VTE_CFLAGS@,$VTE_CFLAGS,;t t
+ s, at VTE_LIBS@,$VTE_LIBS,;t t
+diff -aur ../Terminal-0.2.4-orig/configure.ac ./configure.ac
+--- ../Terminal-0.2.4-orig/configure.ac Sat Mar 19 20:31:05 2005
++++ ./configure.ac Mon Mar 6 17:01:38 2006
+@@ -50,6 +50,7 @@
+
+ dnl Check for required packages
+ XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.0])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
+ XDT_CHECK_PACKAGE([VTE], [vte], [0.11.11])
+
+ dnl Optional support for startup notification
+diff -aur ../Terminal-0.2.4-orig/doc/C/Makefile.in ./doc/C/Makefile.in
+--- ../Terminal-0.2.4-orig/doc/C/Makefile.in Sat Mar 19 20:31:19 2005
++++ ./doc/C/Makefile.in Mon Mar 6 17:05:38 2006
+@@ -145,6 +145,10 @@
+ LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+ LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@
+ LIBTOOL = @LIBTOOL@
++LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
++LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
++LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
++LIBXFCEGUI4_VERSION = @LIBXFCEGUI4_VERSION@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+diff -aur ../Terminal-0.2.4-orig/doc/C/images/Makefile.in ./doc/C/images/Makefile.in
+--- ../Terminal-0.2.4-orig/doc/C/images/Makefile.in Sat Mar 19 20:31:19 2005
++++ ./doc/C/images/Makefile.in Mon Mar 6 17:05:38 2006
+@@ -145,6 +145,10 @@
+ LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+ LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@
+ LIBTOOL = @LIBTOOL@
++LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
++LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
++LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
++LIBXFCEGUI4_VERSION = @LIBXFCEGUI4_VERSION@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+diff -aur ../Terminal-0.2.4-orig/doc/Makefile.in ./doc/Makefile.in
+--- ../Terminal-0.2.4-orig/doc/Makefile.in Sat Mar 19 20:31:19 2005
++++ ./doc/Makefile.in Mon Mar 6 17:05:38 2006
+@@ -154,6 +154,10 @@
+ LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+ LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@
+ LIBTOOL = @LIBTOOL@
++LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
++LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
++LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
++LIBXFCEGUI4_VERSION = @LIBXFCEGUI4_VERSION@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+diff -aur ../Terminal-0.2.4-orig/helpers/Makefile.in ./helpers/Makefile.in
+--- ../Terminal-0.2.4-orig/helpers/Makefile.in Sat Mar 19 20:31:19 2005
++++ ./helpers/Makefile.in Mon Mar 6 17:05:38 2006
+@@ -145,6 +145,10 @@
+ LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+ LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@
+ LIBTOOL = @LIBTOOL@
++LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
++LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
++LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
++LIBXFCEGUI4_VERSION = @LIBXFCEGUI4_VERSION@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+diff -aur ../Terminal-0.2.4-orig/pixmaps/Makefile.in ./pixmaps/Makefile.in
+--- ../Terminal-0.2.4-orig/pixmaps/Makefile.in Sat Mar 19 20:31:19 2005
++++ ./pixmaps/Makefile.in Mon Mar 6 17:05:38 2006
+@@ -148,6 +148,10 @@
+ LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+ LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@
+ LIBTOOL = @LIBTOOL@
++LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
++LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
++LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
++LIBXFCEGUI4_VERSION = @LIBXFCEGUI4_VERSION@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+diff -aur ../Terminal-0.2.4-orig/terminal/Makefile.am ./terminal/Makefile.am
+--- ../Terminal-0.2.4-orig/terminal/Makefile.am Sat Mar 19 17:59:20 2005
++++ ./terminal/Makefile.am Mon Mar 6 17:02:09 2006
+@@ -69,6 +69,7 @@
+ Terminal_CFLAGS = \
+ $(DBUS_CFLAGS) \
+ $(EXO_CFLAGS) \
++ $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBSTARTUP_NOTIFICATION_CFLAGS) \
+ $(VTE_CFLAGS)
+
+@@ -76,6 +77,7 @@
+ -no-undefined \
+ $(DBUS_LIBS) \
+ $(EXO_LIBS) \
++ $(LIBXFCEGUI4_LIBS) \
+ $(LIBSTARTUP_NOTIFICATION_LIBS) \
+ $(VTE_LIBS)
+
+@@ -120,7 +122,7 @@
+ @true
+ stamp-terminal-enum-types.h: $(Terminal_headers) Makefile
+ ( cd $(srcdir) && glib-mkenums \
+- --fhead "#ifndef __TERMINAL_ENUM_TYPES_H__\n#define __TERMINAL_ENUM_TYPES_H__\n#include <libxfce4util/libxfce4util.h>\nG_BEGIN_DECLS\n" \
++ --fhead "#ifndef __TERMINAL_ENUM_TYPES_H__\n#define __TERMINAL_ENUM_TYPES_H__\n#include <exo/exo.h>\nG_BEGIN_DECLS\n" \
+ --fprod "/* enumerations from \"@filename@\" */\n" \
+ --vhead "GType @enum_name at _get_type (void);\n#define TERMINAL_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
+ --ftail "G_END_DECLS\n\n#endif /* !__TERMINAL_ENUM_TYPES_H__ */" \
+diff -aur ../Terminal-0.2.4-orig/terminal/Makefile.in ./terminal/Makefile.in
+--- ../Terminal-0.2.4-orig/terminal/Makefile.in Sat Mar 19 20:31:20 2005
++++ ./terminal/Makefile.in Mon Mar 6 17:05:39 2006
+@@ -211,6 +211,10 @@
+ LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+ LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@
+ LIBTOOL = @LIBTOOL@
++LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
++LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
++LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
++LIBXFCEGUI4_VERSION = @LIBXFCEGUI4_VERSION@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+@@ -342,13 +346,14 @@
+ terminal-tab-header.c terminal-toolbars-model.c \
+ terminal-toolbars-view.c terminal-widget.c terminal-window.c \
+ $(am__append_2)
+-Terminal_CFLAGS = $(DBUS_CFLAGS) $(EXO_CFLAGS) \
++Terminal_CFLAGS = $(DBUS_CFLAGS) $(EXO_CFLAGS) $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBSTARTUP_NOTIFICATION_CFLAGS) $(VTE_CFLAGS) \
+ $(am__append_1)
+ Terminal_LDFLAGS = \
+ -no-undefined \
+ $(DBUS_LIBS) \
+ $(EXO_LIBS) \
++ $(LIBXFCEGUI4_LIBS) \
+ $(LIBSTARTUP_NOTIFICATION_LIBS) \
+ $(VTE_LIBS)
+
+@@ -1068,7 +1073,7 @@
+ @MAINTAINER_MODE_TRUE@ @true
+ @MAINTAINER_MODE_TRUE at stamp-terminal-enum-types.h: $(Terminal_headers) Makefile
+ @MAINTAINER_MODE_TRUE@ ( cd $(srcdir) && glib-mkenums \
+- at MAINTAINER_MODE_TRUE@ --fhead "#ifndef __TERMINAL_ENUM_TYPES_H__\n#define __TERMINAL_ENUM_TYPES_H__\n#include <libxfce4util/libxfce4util.h>\nG_BEGIN_DECLS\n" \
++ at MAINTAINER_MODE_TRUE@ --fhead "#ifndef __TERMINAL_ENUM_TYPES_H__\n#define __TERMINAL_ENUM_TYPES_H__\n#include <exo/exo.h>\nG_BEGIN_DECLS\n" \
+ @MAINTAINER_MODE_TRUE@ --fprod "/* enumerations from \"@filename@\" */\n" \
+ @MAINTAINER_MODE_TRUE@ --vhead "GType @enum_name at _get_type (void);\n#define TERMINAL_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
+ @MAINTAINER_MODE_TRUE@ --ftail "G_END_DECLS\n\n#endif /* !__TERMINAL_ENUM_TYPES_H__ */" \
+diff -aur ../Terminal-0.2.4-orig/terminal/stock-icons/Makefile.in ./terminal/stock-icons/Makefile.in
+--- ../Terminal-0.2.4-orig/terminal/stock-icons/Makefile.in Sat Mar 19 20:31:20 2005
++++ ./terminal/stock-icons/Makefile.in Mon Mar 6 17:05:39 2006
+@@ -137,6 +137,10 @@
+ LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+ LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@
+ LIBTOOL = @LIBTOOL@
++LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
++LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
++LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
++LIBXFCEGUI4_VERSION = @LIBXFCEGUI4_VERSION@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+diff -aur ../Terminal-0.2.4-orig/terminal/terminal-enum-types.c ./terminal/terminal-enum-types.c
+--- ../Terminal-0.2.4-orig/terminal/terminal-enum-types.c Sat Mar 19 20:32:45 2005
++++ ./terminal/terminal-enum-types.c Mon Mar 6 17:06:09 2006
+@@ -25,7 +25,6 @@
+ return type;
+ }
+
+-
+ /* enumerations from "terminal-helper.h" */
+ GType
+ terminal_helper_category_get_type (void)
+@@ -42,7 +41,6 @@
+ return type;
+ }
+
+-
+ /* enumerations from "terminal-options.h" */
+ GType
+ terminal_visibility_get_type (void)
+@@ -60,7 +58,6 @@
+ return type;
+ }
+
+-
+ /* enumerations from "terminal-preferences.h" */
+ GType
+ terminal_scrollbar_get_type (void)
+@@ -77,7 +74,6 @@
+ }
+ return type;
+ }
+-
+ GType
+ terminal_title_get_type (void)
+ {
+@@ -94,7 +90,6 @@
+ }
+ return type;
+ }
+-
+ GType
+ terminal_background_get_type (void)
+ {
+@@ -110,7 +105,6 @@
+ }
+ return type;
+ }
+-
+ GType
+ terminal_background_style_get_type (void)
+ {
+@@ -127,7 +121,6 @@
+ }
+ return type;
+ }
+-
+ GType
+ terminal_erase_binding_get_type (void)
+ {
+@@ -144,7 +137,6 @@
+ }
+ return type;
+ }
+-
+
+ /* Generated data ends here */
+
+diff -aur ../Terminal-0.2.4-orig/terminal/terminal-enum-types.h ./terminal/terminal-enum-types.h
+--- ../Terminal-0.2.4-orig/terminal/terminal-enum-types.h Mon Mar 14 20:13:19 2005
++++ ./terminal/terminal-enum-types.h Mon Mar 6 17:03:29 2006
+@@ -3,41 +3,28 @@
+
+ #ifndef __TERMINAL_ENUM_TYPES_H__
+ #define __TERMINAL_ENUM_TYPES_H__
+-#include <libxfce4util/libxfce4util.h>
++#include <exo/exo.h>
+ G_BEGIN_DECLS
+-
+ /* enumerations from "terminal-app.h" */
+-
+ GType terminal_error_get_type (void);
+ #define TERMINAL_TYPE_ERROR (terminal_error_get_type())
+-
+ /* enumerations from "terminal-helper.h" */
+-
+ GType terminal_helper_category_get_type (void);
+ #define TERMINAL_TYPE_HELPER_CATEGORY (terminal_helper_category_get_type())
+-
+ /* enumerations from "terminal-options.h" */
+-
+ GType terminal_visibility_get_type (void);
+ #define TERMINAL_TYPE_VISIBILITY (terminal_visibility_get_type())
+-
+ /* enumerations from "terminal-preferences.h" */
+-
+ GType terminal_scrollbar_get_type (void);
+ #define TERMINAL_TYPE_SCROLLBAR (terminal_scrollbar_get_type())
+-
+ GType terminal_title_get_type (void);
+ #define TERMINAL_TYPE_TITLE (terminal_title_get_type())
+-
+ GType terminal_background_get_type (void);
+ #define TERMINAL_TYPE_BACKGROUND (terminal_background_get_type())
+-
+ GType terminal_background_style_get_type (void);
+ #define TERMINAL_TYPE_BACKGROUND_STYLE (terminal_background_style_get_type())
+-
+ GType terminal_erase_binding_get_type (void);
+ #define TERMINAL_TYPE_ERASE_BINDING (terminal_erase_binding_get_type())
+-
+ G_END_DECLS
+
+ #endif /* !__TERMINAL_ENUM_TYPES_H__ */
+diff -aur ../Terminal-0.2.4-orig/terminal/terminal-helper.c ./terminal/terminal-helper.c
+--- ../Terminal-0.2.4-orig/terminal/terminal-helper.c Mon Mar 14 01:38:19 2005
++++ ./terminal/terminal-helper.c Mon Mar 6 17:03:50 2006
+@@ -35,6 +35,8 @@
+
+ #include <exo/exo.h>
+
++#include <libxfcegui4/libxfcegui4.h>
++
+ #include <terminal/terminal-enum-types.h>
+ #include <terminal/terminal-helper.h>
+
+diff -aur ../Terminal-0.2.4-orig/terminal/terminal-screen.c ./terminal/terminal-screen.c
+--- ../Terminal-0.2.4-orig/terminal/terminal-screen.c Sun Mar 13 17:06:38 2005
++++ ./terminal/terminal-screen.c Mon Mar 6 17:04:17 2006
+@@ -39,6 +39,8 @@
+
+ #include <exo/exo.h>
+
++#include <gdk/gdkx.h>
++
+ #include <terminal/terminal-enum-types.h>
+ #include <terminal/terminal-helper.h>
+ #include <terminal/terminal-image-loader.h>
+diff -aur ../Terminal-0.2.4-orig/terminal/terminal-shortcut-editor.c ./terminal/terminal-shortcut-editor.c
+--- ../Terminal-0.2.4-orig/terminal/terminal-shortcut-editor.c Mon Jan 31 00:49:43 2005
++++ ./terminal/terminal-shortcut-editor.c Mon Mar 6 17:04:32 2006
+@@ -26,6 +26,7 @@
+ #endif
+
+ #include <gdk/gdkkeysyms.h>
++#include <gdk/gdkx.h>
+
+ #include <terminal/terminal-preferences.h>
+ #include <terminal/terminal-shortcut-editor.h>
+diff -aur ../Terminal-0.2.4-orig/terminal/terminal-window.c ./terminal/terminal-window.c
+--- ../Terminal-0.2.4-orig/terminal/terminal-window.c Thu Mar 17 10:18:58 2005
++++ ./terminal/terminal-window.c Mon Mar 6 17:04:56 2006
+@@ -46,6 +46,8 @@
+ #include <libsn/sn-launchee.h>
+ #endif
+
++#include <libxfcegui4/libxfcegui4.h>
++
+ #include <terminal/terminal-enum-types.h>
+ #include <terminal/terminal-helper-dialog.h>
+ #include <terminal/terminal-options.h>
More information about the Pkg-xfce-commits
mailing list