From b270f956327044f56bec89a73ed1f77c52cb73a9 Mon Sep 17 00:00:00 2001 From: Lukas Elsner Date: Mon, 10 Sep 2012 03:42:02 +0200 Subject: clean up --- gnome-extra/battery-status/Manifest | 1 - .../battery-status/battery-status-9999.ebuild | 23 - gnome-extra/cinnamon/Manifest | 5 - gnome-extra/cinnamon/cinnamon-1.4-r1.ebuild | 233 ----------- .../cinnamon-1.1.3-automagic-gnome-bluetooth.patch | 44 -- .../cinnamon-1.3.1-optional-networkmanager.patch | 171 -------- .../cinnamon/files/cinnamon-1.4-notification.patch | 115 ----- gnome-extra/libgda/Manifest | 15 - .../files/libgda-4.2.0-fix-build-order.patch | 36 -- ...missing-include-in-keyword_hash-generator.patch | 27 -- .../files/libgda-4.2.2-fix-build-order.patch | 20 - .../libgda/files/libgda-4.2.5-missing-m4.patch | 12 - gnome-extra/libgda/files/libgda-4.2.8-ldap.patch | 27 -- .../libgda/files/libgda-4.2.8-sandbox-fix.patch | 55 --- ...bgda-4.99.1-control-center-icon-collision.patch | 85 ---- .../libgda-4.99.1-gda-browser-doc-collision.patch | 43 -- .../libgda-4.99.1-gda-browser-help-collision.patch | 38 -- .../files/libgda-4.99.4-disable-broken-tests.patch | 15 - .../libgda-4.99.4-statement-rewriting-fix.patch | 465 --------------------- .../files/libgda-9999-disable-broken-tests.patch | 15 - .../libgda/files/libgda-9999-fix-build-order.patch | 14 - gnome-extra/libgda/libgda-4.99.4-r1.ebuild | 167 -------- 22 files changed, 1626 deletions(-) delete mode 100644 gnome-extra/battery-status/Manifest delete mode 100644 gnome-extra/battery-status/battery-status-9999.ebuild delete mode 100644 gnome-extra/cinnamon/Manifest delete mode 100644 gnome-extra/cinnamon/cinnamon-1.4-r1.ebuild delete mode 100644 gnome-extra/cinnamon/files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch delete mode 100644 gnome-extra/cinnamon/files/cinnamon-1.3.1-optional-networkmanager.patch delete mode 100644 gnome-extra/cinnamon/files/cinnamon-1.4-notification.patch delete mode 100644 gnome-extra/libgda/Manifest delete mode 100644 gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.2.8-ldap.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch delete mode 100644 gnome-extra/libgda/files/libgda-9999-disable-broken-tests.patch delete mode 100644 gnome-extra/libgda/files/libgda-9999-fix-build-order.patch delete mode 100644 gnome-extra/libgda/libgda-4.99.4-r1.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/battery-status/Manifest b/gnome-extra/battery-status/Manifest deleted file mode 100644 index 517e5aa..0000000 --- a/gnome-extra/battery-status/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD battery-status-9999.ebuild 422 RMD160 454f8a5c8b4928368329db280da6734481784c58 SHA1 b3618122368101429078e5698a164662e35448d5 SHA256 93141aab7809795745c99ec5b90893c31ffc55ab116b8689d4e9f38a9cc289cf diff --git a/gnome-extra/battery-status/battery-status-9999.ebuild b/gnome-extra/battery-status/battery-status-9999.ebuild deleted file mode 100644 index 9ba864f..0000000 --- a/gnome-extra/battery-status/battery-status-9999.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -inherit distutils git - - -DESCRIPTION="Battery applet/indicator for the GNOME" -HOMEPAGE="https://github.com/ia/battery-status" -EGIT_REPO_URI="https://github.com/ia/battery-status.git" -SRC_URI="" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - - diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest deleted file mode 100644 index bc4dcc6..0000000 --- a/gnome-extra/cinnamon/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX cinnamon-1.1.3-automagic-gnome-bluetooth.patch 1841 RMD160 4b57dfeb42f299ef74799409132778b60ddc7a09 SHA1 4acf93b0bda58660b6c7ed5c8fdb6b06df86c035 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2 -AUX cinnamon-1.3.1-optional-networkmanager.patch 6649 RMD160 458403c896c245240207d034b74218031d71331d SHA1 2207b02f60694f267d4511fb4538565618873750 SHA256 37bb34e61dbf4700d1a7ff92a47b1544a35edf3fc4eb5d863c295e2372613f01 -AUX cinnamon-1.4-notification.patch 4214 RMD160 8cc8d5f1c64fbdb7b780255c21d2a43ccc6a2db9 SHA1 c9753919f012a04cf41d810e7302bac00f4a273b SHA256 3c88fc9ab18ab5d9203b631f3986ee54ef44a1963480aaa141eab16dc260c578 -DIST cinnamon-1.4.tar.gz 2639153 RMD160 2282c0adb00d199f8dbf11f9e5a35600784aa795 SHA1 405db74662f23e99cc5646e74d2b5581adc860b5 SHA256 26fa922bfd73d3b8f4c954e6b79b97450bd6be4875680acafd823814bfd6d20f -EBUILD cinnamon-1.4-r1.ebuild 8072 RMD160 840ac6a74372abe0620e44b1ea1219dc4d493125 SHA1 e59b65149390d4ddb334d3f492dc4905a96b2a19 SHA256 6309d98f611ed502e7878cab81ab6f191dc8fb0f74f8f4780d2874623fc10b74 diff --git a/gnome-extra/cinnamon/cinnamon-1.4-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.4-r1.ebuild deleted file mode 100644 index 62b28a3..0000000 --- a/gnome-extra/cinnamon/cinnamon-1.4-r1.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.4.ebuild,v 1.1 2012/03/15 06:05:24 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_DEPEND="2:2.5" -PYTHON_USE_WITH="xml" - -inherit autotools eutils gnome2 multilib pax-utils python - -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" -HOMEPAGE="http://cinnamon.linuxmint.com/" - -SRC_URI="https://github.com/linuxmint/Cinnamon/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+bluetooth +networkmanager" -KEYWORDS="~amd64 ~x86" - -# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop -# latest gsettings-desktop-schemas is needed due to commit 602fa1c6 -# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057 -# libXfixes-5.0 needed for pointer barriers -# gnome-menus-3.2.0.1-r1 needed for new 10-xdg-menu-gnome -COMMON_DEPEND=">=dev-libs/glib-2.29.10:2 - >=dev-libs/gjs-1.29.18 - >=dev-libs/gobject-introspection-0.10.1 - x11-libs/gdk-pixbuf:2[introspection] - >=x11-libs/gtk+-3.0.0:3[introspection] - >=media-libs/clutter-1.7.5:1.0[introspection] - app-misc/ca-certificates - >=dev-libs/folks-0.5.2 - >=dev-libs/json-glib-0.13.2 - >=gnome-base/gnome-desktop-2.91.2:3[introspection] - >=gnome-base/gsettings-desktop-schemas-2.91.91 - >=gnome-extra/evolution-data-server-2.91.6 - >=media-libs/gstreamer-0.10.16:0.10 - >=media-libs/gst-plugins-base-0.10.16:0.10 - >=net-im/telepathy-logger-0.2.4[introspection] - net-libs/libsoup:2.4[introspection] - >=net-libs/telepathy-glib-0.15.5[introspection] - >=sys-auth/polkit-0.100[introspection] - >=x11-wm/muffin-1.0.2[introspection] - - dev-libs/dbus-glib - dev-libs/libxml2:2 - x11-libs/pango[introspection] - >=dev-libs/libcroco-0.6.2:0.6 - - gnome-base/gconf:2[introspection] - >=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] - gnome-base/librsvg - media-libs/libcanberra - media-sound/pulseaudio - - >=x11-libs/startup-notification-0.11 - x11-libs/libX11 - >=x11-libs/libXfixes-5.0 - x11-apps/mesa-progs - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) - networkmanager? ( - gnome-base/libgnome-keyring - >=net-misc/networkmanager-0.8.999[introspection] )" -# Runtime-only deps are probably incomplete and approximate. -# Each block: -# 2. Introspection stuff + dconf needed via imports.gi.* -# 3. gnome-session is needed for gnome-session-quit -# 4. Control shell settings -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast -# user switching with gdm-3.1.x) -# 6. caribou needed for on-screen keyboard -# 7. xdg-utils needed for xdg-open, used by extension tool -# 8. gconf-python needed for cinnamon-settings -# 9. gnome-icon-theme-symbolic needed for various icons -# 10. pygtk and gnome-menus:0 needed for menu editor -RDEPEND="${COMMON_DEPEND} - >=gnome-base/dconf-0.4.1 - >=gnome-base/libgnomekbd-2.91.4[introspection] - sys-power/upower[introspection] - - >=gnome-base/gnome-session-3.2.1-r1 - - >=gnome-base/gnome-settings-daemon-2.91 - >=gnome-base/gnome-control-center-2.91.92-r1 - - >=sys-apps/accountsservice-0.6.14[introspection] - - >=app-accessibility/caribou-0.3 - - x11-misc/xdg-utils - - dev-python/dbus-python - dev-python/gconf-python:2 - - x11-themes/gnome-icon-theme-symbolic - - dev-python/pygtk - gnome-base/gnome-menus:0[python] - - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data )" -DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.17 - >=dev-util/pkgconfig-0.22 - >=dev-util/intltool-0.40 - gnome-base/gnome-common - !!=dev-lang/spidermonkey-1.8.2*" -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time -# https://bugs.gentoo.org/show_bug.cgi?id=360413 - -S="${WORKDIR}/linuxmint-Cinnamon-a8b1a03" - -pkg_setup() { - DOCS="AUTHORS NEWS README" - # Don't error out on warnings - G2CONF="${G2CONF} - --enable-compile-warnings=maximum - --disable-schemas-compile - --disable-jhbuild-wrapper-script - $(use_with bluetooth) - $(use_enable networkmanager) - --with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt - BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # Fix automagic gnome-bluetooth dep, bug #398145 - epatch "${FILESDIR}/${PN}-1.1.3-automagic-gnome-bluetooth.patch" - - # Make networkmanager optional, bug #398593 - epatch "${FILESDIR}/${PN}-1.3.1-optional-networkmanager.patch" - - # Fix notification issue - epatch "${FILESDIR}/${PN}-1.4-notification.patch" - - # Gentoo uses /usr/libexec - sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \ - -i "files/usr/share/gnome-session/sessions/cinnamon.session" || die "sed 1 failed" - - # Gentoo uses /usr/$(get_libdir), not /usr/lib even for python - sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \ - -e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \ - -i files/usr/bin/cinnamon-menu-editor \ - -i files/usr/bin/cinnamon-settings \ - -i files/usr/lib/cinnamon-menu-editor/Alacarte/config.py \ - -i files/usr/lib/cinnamon-settings/cinnamon-settings.py \ - -i files/generate_desktop_files || die "sed 2 failed" - if [[ "$(get_libdir)" != lib ]]; then - mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed" - fi - - if ! use bluetooth; then - rm -rv files/usr/share/cinnamon/applets/bluetooth@cinnamon.org || die - fi - - if ! use networkmanager; then - rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die - fi - - eautoreconf - gnome2_src_prepare - - # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 - # Note: sed Makefile.in because it is generated from several Makefile.ams - sed -e 's/-DG_DISABLE_DEPRECATED//g' \ - -i src/Makefile.in browser-plugin/Makefile.in || die "sed 3 failed" -} - -src_install() { - gnome2_src_install - python_convert_shebangs 2 "${ED}usr/bin/cinnamon-extension-tool" \ - "${ED}usr/bin/cinnamon-menu-editor" \ - "${ED}usr/bin/cinnamon-settings" \ - "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" - - # Required for gnome-shell on hardened/PaX, bug #398941 - pax-mark mr "${ED}usr/bin/cinnamon" -} - -pkg_postinst() { - gnome2_pkg_postinst - python_mod_optimize "/usr/$(get_libdir)/"cinnamon-{menu-editor,settings} - - if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \ - ! has_version 'media-plugins/gst-plugins-vp8'; then - ewarn "To make use of Cinnamon's built-in screen recording utility," - ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23" - ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version ">=x11-base/xorg-server-1.11"; then - ewarn "If you use multiple screens, it is highly recommended that you" - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" - ewarn "pointer barriers which will make it easier to use hot corners." - fi - - if has_version " -Date: Sun, 8 Jan 2012 13:55:05 +0000 -Subject: [PATCH] Fix automagic gnome-bluetooth dependency - -https://bugs.gentoo.org/show_bug.cgi?id=398145 - -Ed Catmur 2012-01-08 13:46:22 UTC -libgnome-bluetooth-applet is a private library so they shouldn't be linking -against it anyway. I tried to work out how to tell libtool to add it to rpath -but got totally lost. - -I'll see if I can work out how to fix the automagic gnome-bluetooth dependency -so I can at least merge USE=-bluetooth. ---- - configure.ac | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1c64122..a699838 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -127,6 +127,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) - PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7) - - AC_MSG_CHECKING([for bluetooth support]) -+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)])) -+AS_IF([test "x$with_bluetooth" != "xno"], [ - PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], - [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` - BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` -@@ -138,6 +140,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], - [AC_DEFINE([HAVE_BLUETOOTH],[0]) - AC_SUBST([HAVE_BLUETOOTH],[0]) - AC_MSG_RESULT([no])]) -+], [AC_DEFINE([HAVE_BLUETOOTH],[0]) -+ AC_SUBST([HAVE_BLUETOOTH],[0]) -+ AC_MSG_RESULT([no])]) - - PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0) - AC_SUBST(CALENDAR_SERVER_CFLAGS) --- -1.7.8.2 - diff --git a/gnome-extra/cinnamon/files/cinnamon-1.3.1-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-1.3.1-optional-networkmanager.patch deleted file mode 100644 index 6e2d431..0000000 --- a/gnome-extra/cinnamon/files/cinnamon-1.3.1-optional-networkmanager.patch +++ /dev/null @@ -1,171 +0,0 @@ -From aebde5fad2f477f40b62c96118128011bd821be0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Wed, 25 Jan 2012 01:58:07 -0500 -Subject: [PATCH] Make NM optional - -Derived from a patch for gnome-shell by Michael Biebl -(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652482#29) ---- - configure.ac | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- - js/misc/config.js.in | 2 ++ - js/ui/main.js | 7 +++++-- - src/Makefile.am | 13 ++++++++----- - 4 files changed, 61 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 49b5401..508a8cd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -94,8 +94,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION - libcanberra - telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION - telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION -- polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes -- libnm-glib libnm-util gnome-keyring-1) -+ polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes) -+ -+########################## -+# Check for NetworkManager -+########################## -+NM_MIN_VERSION=0.9 -+AC_ARG_ENABLE(networkmanager, -+ AS_HELP_STRING([--disable-networkmanager], -+ [disable NetworkManager support @<:@default=auto@:>@]),, -+ [enable_networkmanager=auto]) -+ -+if test "x$enable_networkmanager" != "xno"; then -+ PKG_CHECK_MODULES(NETWORKMANAGER, -+ [libnm-glib libnm-util gnome-keyring-1], -+ [have_networkmanager=yes], -+ [have_networkmanager=no]) -+ -+ CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS" -+ CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS" -+else -+ have_networkmanager="no (disabled)" -+fi -+ -+if test "x$have_networkmanager" = "xyes"; then -+ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager]) -+ AC_SUBST([HAVE_NETWORKMANAGER], [1]) -+else -+ if test "x$enable_networkmanager" = "xyes"; then -+ AC_MSG_ERROR([Couldn't find NetworkManager.]) -+ fi -+ AC_SUBST([HAVE_NETWORKMANAGER], [0]) -+fi -+ -+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes") - - PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0) - -@@ -250,3 +282,15 @@ AC_CONFIG_FILES([ - files/Makefile - ]) - AC_OUTPUT -+ -+echo " -+Build configuration: -+ -+ Prefix: ${prefix} -+ Source code location: ${srcdir} -+ Compiler: ${CC} -+ Compiler Warnings: $enable_compile_warnings -+ -+ Support for NetworkManager: $have_networkmanager -+ Support for GStreamer recording: $build_recorder -+" -diff --git a/js/misc/config.js.in b/js/misc/config.js.in -index 704989b..df7e014 100644 ---- a/js/misc/config.js.in -+++ b/js/misc/config.js.in -@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@'; - const GJS_VERSION = '@GJS_VERSION@'; - /* 1 if gnome-bluetooth is available, 0 otherwise */ - const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@; -+/* 1 if networkmanager is available, 0 otherwise */ -+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@; - /* The system TLS CA list */ - const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@'; -diff --git a/js/ui/main.js b/js/ui/main.js -index ae15997..803e6f4 100644 ---- a/js/ui/main.js -+++ b/js/ui/main.js -@@ -14,6 +14,7 @@ const St = imports.gi.St; - - const AutomountManager = imports.ui.automountManager; - const AutorunManager = imports.ui.autorunManager; -+const Config = imports.misc.config; - const EndSessionDialog = imports.ui.endSessionDialog; - const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent; - const Environment = imports.ui.environment; -@@ -27,7 +28,7 @@ const PlacesManager = imports.ui.placesManager; - const RunDialog = imports.ui.runDialog; - const Layout = imports.ui.layout; - const LookingGlass = imports.ui.lookingGlass; --const NetworkAgent = imports.ui.networkAgent; -+const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null; - const NotificationDaemon = imports.ui.notificationDaemon; - const WindowAttentionHandler = imports.ui.windowAttentionHandler; - const Scripting = imports.ui.scripting; -@@ -88,7 +89,9 @@ function _createUserSession() { - placesManager = new PlacesManager.PlacesManager(); - automountManager = new AutomountManager.AutomountManager(); - autorunManager = new AutorunManager.AutorunManager(); -- networkAgent = new NetworkAgent.NetworkAgent(); -+ if (Config.HAVE_NETWORKMANAGER) { -+ networkAgent = new NetworkAgent.NetworkAgent(); -+ } - } - - function _createGDMSession() { -diff --git a/src/Makefile.am b/src/Makefile.am -index 182bf17..54770e7 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -108,9 +108,7 @@ cinnamon_public_headers_h = \ - cinnamon-generic-container.h \ - cinnamon-gtk-embed.h \ - cinnamon-global.h \ -- cinnamon-mobile-providers.h \ - cinnamon-mount-operation.h \ -- cinnamon-network-agent.h \ - cinnamon-perf-log.h \ - cinnamon-slicer.h \ - cinnamon-stack.h \ -@@ -145,9 +143,7 @@ libcinnamon_la_SOURCES = \ - cinnamon-generic-container.c \ - cinnamon-gtk-embed.c \ - cinnamon-global.c \ -- cinnamon-mobile-providers.c \ - cinnamon-mount-operation.c \ -- cinnamon-network-agent.c \ - cinnamon-perf-log.c \ - cinnamon-polkit-authentication-agent.h \ - cinnamon-polkit-authentication-agent.c \ -@@ -161,6 +157,10 @@ libcinnamon_la_SOURCES = \ - cinnamon-wm.c \ - cinnamon-xfixes-cursor.c - -+if HAVE_NETWORKMANAGER -+libcinnamon_la_SOURCES += cinnamon-mobile-providers.h cinnamon-mobile-providers.c cinnamon-network-agent.h cinnamon-network-agent.c -+endif -+ - libcinnamon_la_gir_sources = \ - $(filter-out %-private.h $(cinnamon_recorder_non_gir_sources), $(cinnamon_public_headers_h) $(libcinnamon_la_SOURCES)) - -@@ -272,7 +272,10 @@ libcinnamon_la_LIBADD = \ - libcinnamon_la_CPPFLAGS = $(cinnamon_cflags) - - Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir --Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6 -+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6 -+if HAVE_NETWORKMANAGER -+Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0 -+endif - Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir) - Cinnamon_0_1_gir_LIBS = libcinnamon.la - Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) --- -1.7.8.4 - diff --git a/gnome-extra/cinnamon/files/cinnamon-1.4-notification.patch b/gnome-extra/cinnamon/files/cinnamon-1.4-notification.patch deleted file mode 100644 index 83d6938..0000000 --- a/gnome-extra/cinnamon/files/cinnamon-1.4-notification.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 3af53231970861564c01c5f64fe18fe128d2e246 Mon Sep 17 00:00:00 2001 -From: Lukas Elsner -Date: Sun, 15 Apr 2012 14:33:34 +0200 -Subject: [PATCH] implemented rat4's patch - ---- - data/org.cinnamon.gschema.xml | 6 ++++ - data/org.cinnamon.gschema.xml.in | 5 ++++ - js/ui/windowAttentionHandler.js | 48 +++++++++++++++++++++++++++++++++++-- - 3 files changed, 56 insertions(+), 3 deletions(-) - -diff --git a/data/org.cinnamon.gschema.xml b/data/org.cinnamon.gschema.xml -index a413619..28ad28b 100644 ---- a/data/org.cinnamon.gschema.xml -+++ b/data/org.cinnamon.gschema.xml -@@ -127,6 +127,12 @@ - Layout styles: traditional (1 panel at the bottom), flipped (1 panel on top), classic (1 panel on top, 1 panel at the bottom) - - -+ -+ -+ 2 -+ Notification style -+ -+ - - "YYYY-MM-DD" - Auto-hide panel -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index c496c3d..e598146 100644 ---- a/data/org.cinnamon.gschema.xml.in -+++ b/data/org.cinnamon.gschema.xml.in -@@ -175,6 +175,11 @@ - - - -+ -+ 2 -+ <_summary>Notification style -+ -+ - - "YYYY-MM-DD" - <_summary>Auto-hide panel -diff --git a/js/ui/windowAttentionHandler.js b/js/ui/windowAttentionHandler.js -index a81f10c..7594ed0 100644 ---- a/js/ui/windowAttentionHandler.js -+++ b/js/ui/windowAttentionHandler.js -@@ -12,8 +12,18 @@ function WindowAttentionHandler() { - - WindowAttentionHandler.prototype = { - _init : function() { -- this._tracker = Cinnamon.WindowTracker.get_default(); -- global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention)); -+ this.notification_style = global.settings.get_int("notification-style"); -+ global.settings.connect("changed::notification-style", Lang.bind(this, function() { -+ this.notification_style = global.settings.get_int("notification-style"); -+ })); -+ this._tracker = Cinnamon.WindowTracker.get_default(); -+ global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention)); -+ }, -+ -+ _getTitleAndBanner: function(app, window) { -+ let title = app.get_name(); -+ let banner = _("'%s' is ready").format(window.get_title()); -+ return [title, banner] - }, - - _onWindowDemandsAttention : function(display, window) { -@@ -28,9 +38,41 @@ WindowAttentionHandler.prototype = { - if (!window || window.has_focus() || window.is_skip_taskbar()) - return; - -- if (this._tracker.is_window_interesting(window)) { -+ switch (this.notification_style) { -+ case 0: -+ break; -+ case 1: -+ this.bringToFront(window); -+ break; -+ case 2: -+ this.showBanner(window); -+ break; -+ default: -+ global.log('Unknown notification style: ' + this.notification_style); -+ } -+ -+ }, -+ -+ bringToFront : function(window) { -+ if (this._tracker.is_window_interesting(window)) { - window.activate(global.get_current_time()); - } -+ }, -+ -+ showBanner : function(window) { -+ let app = this._tracker.get_window_app(window); -+ let source = new Source(app, window); -+ if (Main.messageTray) Main.messageTray.add(source); -+ -+ let [title, banner] = this._getTitleAndBanner(app, window); -+ -+ let notification = new MessageTray.Notification(source, title, banner); -+ source.notify(notification); -+ -+ source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function() { -+ let [title, banner] = this._getTitleAndBanner(app, window); -+ notification.update(title, banner); -+ }))); - } - }; - --- -1.7.8.5 - diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest deleted file mode 100644 index 3b3f433..0000000 --- a/gnome-extra/libgda/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX libgda-4.2.0-fix-build-order.patch 1260 RMD160 45d51d47cc3e7117e80d30f360d6bf5988330153 SHA1 15ebfd96457e72b9c04f4b94e615576eb7a590ff SHA256 e7cf87eece86ecdbb1ee8a877b757b5cff05a8efe309f7551b865a01a07b75ab -AUX libgda-4.2.0-missing-include-in-keyword_hash-generator.patch 897 RMD160 2a879a730831b7d6c05bf3a48df542cbf025adc4 SHA1 d76018f2b545290174cce55be7c4561edf7772bc SHA256 7cc133de8931b1dc86a08ee7a620e8b9218071723549734ea2290440318a7b8f -AUX libgda-4.2.2-fix-build-order.patch 738 RMD160 b17874c3aab6b50b342e612e24bc706f4b6a077d SHA1 f72ecb1dd74a776decfb8fc6c7de1b0ceec90d43 SHA256 d8a293598d8277b766f5971066b27aeab45e2ead491b2250b5d700577c44a0e1 -AUX libgda-4.2.5-missing-m4.patch 359 RMD160 495d1eb184ffeb1d529a385291b61b41fccff445 SHA1 55c70bfdbaf9411a10ddf6f63b71f6e12b315703 SHA256 ed03d29bdb6454d6a54bd21cb1844ecd294e2d58593ec58496deb09953176b2f -AUX libgda-4.2.8-ldap.patch 900 RMD160 aa2bb0c3972cbc06408b3905cea97ecde7b4d3c8 SHA1 c343c8f054706738691a3691b1db601b3d7df20a SHA256 fe2ca3407626b87b9daca3f20293ba91de7faeb099312ee0a1b627561f19f07f -AUX libgda-4.2.8-sandbox-fix.patch 1884 RMD160 8f22b90ed93c634a01f9d2e3883ab346181c5131 SHA1 885cb7fc5d4cd899df1d9d28a9f70496f11b2120 SHA256 9eb945c021309a2ebd1d1f5f92c44a787b9e60519929f0c954e814a134e9ae0a -AUX libgda-4.99.1-control-center-icon-collision.patch 4936 RMD160 09a5e9d06384f38512ec6efcdb030db4840657b7 SHA1 195bcd2a4c31517e0c12df8b144e7b79b19c59cc SHA256 d9d77e140b9c59f8e5e5afdb2103e1be18e1cc3e798824385bfc440a8b6a4c78 -AUX libgda-4.99.1-gda-browser-doc-collision.patch 1847 RMD160 b103d8a8eb0e44318afe78191f0a6041b7364aa0 SHA1 b38ae8cdda23c6abd16d3aa1017b0bccd0d689b5 SHA256 54afb7f259dad0d3fd7a4de057113f788e64c212c4c3c25b8987a9223540dea0 -AUX libgda-4.99.1-gda-browser-help-collision.patch 1270 RMD160 e7675db0e35b98d4f94b22b204b806c9938051c1 SHA1 1ba6f0587f82a66f7062cc48fff05b024b8bdc4d SHA256 b9d20506fe89fd0219f3d737450bbba0a98e5b850cf152e570ca8a6a66740994 -AUX libgda-4.99.4-disable-broken-tests.patch 363 RMD160 3c2559b32d5a01b9377782f7130980b68ca85f8a SHA1 360074a84e6eadc7480a8e1adeceedce344af0d7 SHA256 cbc8b5bbd5577538f68d1625616f3812ebb1976d05b356b13feb491eb1174f5c -AUX libgda-4.99.4-statement-rewriting-fix.patch 17054 RMD160 b8b5a084b9e548b913595ae94defa9320b17febe SHA1 e702517de6d0fb128f46513a7d9bd839d20930ba SHA256 81c6089b0899ef43428e5e6f182df153c85730e879f2ecefa7c769b0073c756d -AUX libgda-9999-disable-broken-tests.patch 363 RMD160 3c2559b32d5a01b9377782f7130980b68ca85f8a SHA1 360074a84e6eadc7480a8e1adeceedce344af0d7 SHA256 cbc8b5bbd5577538f68d1625616f3812ebb1976d05b356b13feb491eb1174f5c -AUX libgda-9999-fix-build-order.patch 372 RMD160 31346346a53beed118f4131ec1eafd5cb3f3ee71 SHA1 ccdb903ba680c6acf614498c612b317be5a696d8 SHA256 3979cbcc1f0fd2943fd426bde591fdf12c614f72ac43582e4c25900e13154142 -DIST libgda-4.99.4.tar.xz 11621632 RMD160 a786eb9c5ab4798fe7fadabf60989060b7380616 SHA1 773f137df3e54cc55d210e810e8708538c1c495c SHA256 efef38c0318d156ba3263416355847af961f561660793cb670633e056018beac -EBUILD libgda-4.99.4-r1.ebuild 5036 RMD160 6665d4ee62ae5fb8cf2b8a42d048f92214ac9024 SHA1 f38ab8af3e28bff78dbfcea3a68f60ae041cfac2 SHA256 ff46cb3111cf95255ffd17d5f2874b9182a24f726de99acf6defbf4ed60602bb diff --git a/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch b/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch deleted file mode 100644 index 4c1aca0..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f39858f84155d0346d31a2607997257a54e246ff Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 29 Sep 2010 23:45:46 +0200 -Subject: [PATCH] fix build order for xml_embedded.h - ---- - libgda/sqlite/Makefile.am | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am -index 1d2df2c..ecce04b 100644 ---- a/libgda/sqlite/Makefile.am -+++ b/libgda/sqlite/Makefile.am -@@ -58,9 +58,9 @@ sqlitesources = \ - gda-sqlite.h \ - keywords_hash.h \ - gda-symbols-util.h \ -- gda-symbols-util.c -- --$(libgda_sqlite_la_OBJECTS): xml_embedded.h keywords_hash.c -+ gda-symbols-util.c \ -+ xml_embedded.h \ -+ keywords_hash.c - - libgda_sqlite_la_SOURCES = $(sqlitesources) - libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\" -@@ -85,4 +85,5 @@ gdainclude_HEADERS=$(sqliteheaders) - - EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list - --CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) xml_embedded.h mkkeywordhash$(EXEEXT_FOR_BUILD) keywords_hash.c -+CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES) -+BUILT_SOURCES = xml_embedded.h keywords_hash.c --- -1.7.3 - diff --git a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch b/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch deleted file mode 100644 index 5e7dd61..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9f219a98731085ef9588622ecdc9d7ba93de92bb Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 29 Sep 2010 23:53:54 +0200 -Subject: [PATCH] Fix missing include in keyword_hash generator - ---- - libgda/sqlite/mkkeywordhash.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/libgda/sqlite/mkkeywordhash.c b/libgda/sqlite/mkkeywordhash.c -index dc6ce89..28f4f83 100644 ---- a/libgda/sqlite/mkkeywordhash.c -+++ b/libgda/sqlite/mkkeywordhash.c -@@ -370,6 +370,10 @@ main (int argc, char **argv) - } - - /* Begin generating code */ -+ printf("#include \n"); -+ printf("#include \n"); -+ printf("#include \n"); -+ - printf("/* Hash score: %d */\n", bestCount); - printf("static int %skeywordCode(const char *z, int n){\n", prefix ? prefix : ""); - printf(" /* zText[] encodes %d bytes of keywords in %d bytes */\n", --- -1.7.3 - diff --git a/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch b/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch deleted file mode 100644 index ac31089..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libgda/sqlite/Makefile.am.orig 2010-12-04 11:33:12.000000000 +0100 -+++ libgda/sqlite/Makefile.am 2010-12-04 11:34:50.000000000 +0100 -@@ -58,9 +58,9 @@ - gda-sqlite.h \ - keywords_hash.h \ - gda-symbols-util.h \ -- gda-symbols-util.c -- --BUILT_SOURCES = xml_embedded.h keywords_hash.c -+ gda-symbols-util.c \ -+ xml_embedded.h \ -+ keywords_hash.c - - libgda_sqlite_la_SOURCES = $(sqlitesources) - libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\" -@@ -86,3 +86,4 @@ - EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list - - CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES) -+BUILT_SOURCES = xml_embedded.h keywords_hash.c diff --git a/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch b/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch deleted file mode 100644 index bea88cf..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 7ce16f8..3f5ae10 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5,6 +5,7 @@ m4_define([gda_stable], - m4_if(m4_eval(minor % 2), [0], [yes], [no])) - AC_CONFIG_MACRO_DIR([m4]) - m4_include(m4/introspection.m4) -+m4_include(m4/dk-warn.m4) - m4_include(m4/mdbtools.m4) - m4_include(m4/bdb.m4) - m4_include(m4/mysql.m4) diff --git a/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch b/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch deleted file mode 100644 index b8f6d31..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f8042173c2139f65c69502a393fb44e00124ecc6 Mon Sep 17 00:00:00 2001 -From: Daniel Espinosa -Date: Thu, 02 Jun 2011 15:51:52 +0000 -Subject: Added checks for LDAP on table-columns for GdaBrowser - ---- -diff --git a/tools/browser/schema-browser/table-columns.c b/tools/browser/schema-browser/table-columns.c -index 80cdaee..26ad771 100644 ---- a/tools/browser/schema-browser/table-columns.c -+++ b/tools/browser/schema-browser/table-columns.c -@@ -117,12 +117,14 @@ table_columns_show_all (GtkWidget *widget) - { - TableColumns *tcolumns = (TableColumns *) widget; - GTK_WIDGET_CLASS (parent_class)->show_all (widget); -+#ifdef HAVE_LDAP - if (browser_connection_is_ldap (tcolumns->priv->bcnc)) { - if (! tcolumns->priv->ldap_props_shown) { - gtk_widget_hide (tcolumns->priv->ldap_header); - gtk_widget_hide (tcolumns->priv->ldap_text); - } - } -+#endif - } - - GType --- -cgit v0.9 diff --git a/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch b/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch deleted file mode 100644 index 8d24430..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 9c1a1809650321c3d752a143f87089d325c49237 Mon Sep 17 00:00:00 2001 -From: Vivien Malerba -Date: Mon, 06 Jun 2011 18:42:19 +0000 -Subject: Correction for bug #651922 - libgda-4.2.8 wants to write on /etc/libgda-4.0/config during compilation with --enable-gtk-doc - ---- -diff --git a/libgda/gda-config.c b/libgda/gda-config.c -index e1b65c0..e0a51c7 100644 ---- a/libgda/gda-config.c -+++ b/libgda/gda-config.c -@@ -20,6 +20,7 @@ - * Boston, MA 02111-1307, USA. - */ - -+#include - #include - #include - #include -@@ -630,12 +631,34 @@ gda_config_constructor (GType type, - LIBGDA_ABI_NAME, "config", NULL); - unique_instance->priv->system_config_allowed = FALSE; - if (unique_instance->priv->system_file) { -+#ifdef G_OS_WIN32 -+ - FILE *file; - file = fopen (unique_instance->priv->system_file, "a"); /* Flawfinder: ignore */ - if (file) { - unique_instance->priv->system_config_allowed = TRUE; - fclose (file); - } -+#else -+ struct stat stbuf; -+ if (stat (unique_instance->priv->system_file, &stbuf) == 0) { -+ /* use effective user and group IDs */ -+ uid_t euid; -+ gid_t egid; -+ euid = geteuid (); -+ egid = getegid (); -+ if (euid == stbuf.st_uid) { -+ if ((stbuf.st_mode & S_IWUSR) && (stbuf.st_mode & S_IRUSR)) -+ unique_instance->priv->system_config_allowed = TRUE; -+ } -+ else if (egid == stbuf.st_gid) { -+ if ((stbuf.st_mode & S_IWGRP) && (stbuf.st_mode & S_IRGRP)) -+ unique_instance->priv->system_config_allowed = TRUE; -+ } -+ else if ((stbuf.st_mode & S_IWOTH) && (stbuf.st_mode & S_IROTH)) -+ unique_instance->priv->system_config_allowed = TRUE; -+ } -+#endif - } - - /* Setup file monitoring */ --- -cgit v0.9 diff --git a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch deleted file mode 100644 index 06166e6..0000000 --- a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 6ec47f4cf542ad9f7c4d30d557e4813b5c6f31d5 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sat, 4 Jun 2011 05:45:35 -0400 -Subject: [PATCH] Prevent file collision with gda-control-center-4.0's icons - ---- - control-center/data/Makefile.am | 12 ++++++------ - ... hicolor_apps_16x16_gda-control-center-5.0.png} | Bin 833 -> 833 bytes - ... hicolor_apps_22x22_gda-control-center-5.0.png} | Bin 1157 -> 1157 bytes - ... hicolor_apps_24x24_gda-control-center-5.0.png} | Bin 1144 -> 1144 bytes - ...icolor_apps_256x256_gda-control-center-5.0.png} | Bin 33543 -> 33543 bytes - ... hicolor_apps_32x32_gda-control-center-5.0.png} | Bin 1867 -> 1867 bytes - ... hicolor_apps_48x48_gda-control-center-5.0.png} | Bin 3144 -> 3144 bytes - control-center/gda-control-center-5.0.desktop.in | 2 +- - 8 files changed, 7 insertions(+), 7 deletions(-) - rename control-center/data/{hicolor_apps_16x16_gda-control-center.png => hicolor_apps_16x16_gda-control-center-5.0.png} (100%) - rename control-center/data/{hicolor_apps_22x22_gda-control-center.png => hicolor_apps_22x22_gda-control-center-5.0.png} (100%) - rename control-center/data/{hicolor_apps_24x24_gda-control-center.png => hicolor_apps_24x24_gda-control-center-5.0.png} (100%) - rename control-center/data/{hicolor_apps_256x256_gda-control-center.png => hicolor_apps_256x256_gda-control-center-5.0.png} (100%) - rename control-center/data/{hicolor_apps_32x32_gda-control-center.png => hicolor_apps_32x32_gda-control-center-5.0.png} (100%) - rename control-center/data/{hicolor_apps_48x48_gda-control-center.png => hicolor_apps_48x48_gda-control-center-5.0.png} (100%) - -diff --git a/control-center/data/Makefile.am b/control-center/data/Makefile.am -index 03fa362..862ec88 100644 ---- a/control-center/data/Makefile.am -+++ b/control-center/data/Makefile.am -@@ -5,12 +5,12 @@ public_icons_themes = \ - $(NULL) - - public_icons = \ -- hicolor_apps_16x16_gda-control-center.png \ -- hicolor_apps_22x22_gda-control-center.png \ -- hicolor_apps_24x24_gda-control-center.png \ -- hicolor_apps_256x256_gda-control-center.png \ -- hicolor_apps_32x32_gda-control-center.png \ -- hicolor_apps_48x48_gda-control-center.png \ -+ hicolor_apps_16x16_gda-control-center-5.0.png \ -+ hicolor_apps_22x22_gda-control-center-5.0.png \ -+ hicolor_apps_24x24_gda-control-center-5.0.png \ -+ hicolor_apps_256x256_gda-control-center-5.0.png \ -+ hicolor_apps_32x32_gda-control-center-5.0.png \ -+ hicolor_apps_48x48_gda-control-center-5.0.png \ - $(NULL) - - private_icons = \ -diff --git a/control-center/data/hicolor_apps_16x16_gda-control-center.png b/control-center/data/hicolor_apps_16x16_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_16x16_gda-control-center.png -rename to control-center/data/hicolor_apps_16x16_gda-control-center-5.0.png -diff --git a/control-center/data/hicolor_apps_22x22_gda-control-center.png b/control-center/data/hicolor_apps_22x22_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_22x22_gda-control-center.png -rename to control-center/data/hicolor_apps_22x22_gda-control-center-5.0.png -diff --git a/control-center/data/hicolor_apps_24x24_gda-control-center.png b/control-center/data/hicolor_apps_24x24_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_24x24_gda-control-center.png -rename to control-center/data/hicolor_apps_24x24_gda-control-center-5.0.png -diff --git a/control-center/data/hicolor_apps_256x256_gda-control-center.png b/control-center/data/hicolor_apps_256x256_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_256x256_gda-control-center.png -rename to control-center/data/hicolor_apps_256x256_gda-control-center-5.0.png -diff --git a/control-center/data/hicolor_apps_32x32_gda-control-center.png b/control-center/data/hicolor_apps_32x32_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_32x32_gda-control-center.png -rename to control-center/data/hicolor_apps_32x32_gda-control-center-5.0.png -diff --git a/control-center/data/hicolor_apps_48x48_gda-control-center.png b/control-center/data/hicolor_apps_48x48_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_48x48_gda-control-center.png -rename to control-center/data/hicolor_apps_48x48_gda-control-center-5.0.png -diff --git a/control-center/gda-control-center-5.0.desktop.in b/control-center/gda-control-center-5.0.desktop.in -index 6fd5b58..429787d 100644 ---- a/control-center/gda-control-center-5.0.desktop.in -+++ b/control-center/gda-control-center-5.0.desktop.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - _Name=Database access control center - _Comment=Configure your database access environment --Icon=gda-control-center -+Icon=gda-control-center-5.0 - Exec=gda-control-center-5.0 - Terminal=false - Type=Application --- -1.7.5.3 - diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch deleted file mode 100644 index 9616a42..0000000 --- a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch +++ /dev/null @@ -1,43 +0,0 @@ -From bfb0d952d111929174c3326dbc69ab65a808a235 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sat, 4 Jun 2011 05:59:46 -0400 -Subject: [PATCH] Prevent file collision with gda-browser-4.0's gtk-doc files - ---- - tools/browser/doc/Makefile.am | 2 +- - ...browser-docs.sgml => gda-browser-5.0-docs.sgml} | 0 - ...r-sections.txt => gda-browser-5.0-sections.txt} | 0 - .../{gda-browser.types => gda-browser-5.0.types} | 0 - 4 files changed, 1 insertions(+), 1 deletions(-) - rename tools/browser/doc/{gda-browser-docs.sgml => gda-browser-5.0-docs.sgml} (100%) - rename tools/browser/doc/{gda-browser-sections.txt => gda-browser-5.0-sections.txt} (100%) - rename tools/browser/doc/{gda-browser.types => gda-browser-5.0.types} (100%) - -diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am -index 971fa79..cf6637a 100644 ---- a/tools/browser/doc/Makefile.am -+++ b/tools/browser/doc/Makefile.am -@@ -3,7 +3,7 @@ - AUTOMAKE_OPTIONS = 1.6 - - # The name of the module. --DOC_MODULE=gda-browser -+DOC_MODULE=gda-browser-5.0 - - # The top-level SGML file. - DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml -diff --git a/tools/browser/doc/gda-browser-docs.sgml b/tools/browser/doc/gda-browser-5.0-docs.sgml -similarity index 100% -rename from tools/browser/doc/gda-browser-docs.sgml -rename to tools/browser/doc/gda-browser-5.0-docs.sgml -diff --git a/tools/browser/doc/gda-browser-sections.txt b/tools/browser/doc/gda-browser-5.0-sections.txt -similarity index 100% -rename from tools/browser/doc/gda-browser-sections.txt -rename to tools/browser/doc/gda-browser-5.0-sections.txt -diff --git a/tools/browser/doc/gda-browser.types b/tools/browser/doc/gda-browser-5.0.types -similarity index 100% -rename from tools/browser/doc/gda-browser.types -rename to tools/browser/doc/gda-browser-5.0.types --- -1.7.5.3 - diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch deleted file mode 100644 index 46e7282..0000000 --- a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 01b13e22b215647c2343ec5f633b51d3c2b37824 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sat, 4 Jun 2011 01:59:14 -0400 -Subject: [PATCH] Prevent file collision with gda-browser-4.0's help files - ---- - tools/browser/help/Makefile.am | 2 +- - tools/browser/support.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/browser/help/Makefile.am b/tools/browser/help/Makefile.am -index 93acaf8..48fcdc4 100644 ---- a/tools/browser/help/Makefile.am -+++ b/tools/browser/help/Makefile.am -@@ -1,6 +1,6 @@ - include $(top_srcdir)/gnome-doc-utils.make - --DOC_ID = gda-browser -+DOC_ID = gda-browser-5.0 - - DOC_INCLUDES = legal.xml - DOC_FIGURES = \ -diff --git a/tools/browser/support.c b/tools/browser/support.c -index 5b1b4e6..f462efc 100644 ---- a/tools/browser/support.c -+++ b/tools/browser/support.c -@@ -223,7 +223,7 @@ browser_show_help (GtkWindow *parent, const gchar *topic) - if (strchr (lang, '.')) - continue; - -- uri = gda_gbr_get_file_path (GDA_DATA_DIR, "gnome", "help", "gda-browser", lang, NULL); -+ uri = gda_gbr_get_file_path (GDA_DATA_DIR, "gnome", "help", "gda-browser-5.0", lang, NULL); - - /*g_print ("TST URI [%s]\n", uri);*/ - if (g_file_test (uri, G_FILE_TEST_EXISTS)) { --- -1.7.5.3 - diff --git a/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch b/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch deleted file mode 100644 index 1add00a..0000000 --- a/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/value-holders/check_holder.c b/tests/value-holders/check_holder.c -index d014131..289a9ca 100644 ---- a/tests/value-holders/check_holder.c -+++ b/tests/value-holders/check_holder.c -@@ -38,8 +38,8 @@ static gboolean test13 (GError **error); - TestFunc tests[] = { - test1, - test2, -- test3, -- test4, -+// test3, -+// test4, - test5, - test6, - test7, diff --git a/gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch b/gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch deleted file mode 100644 index 07077e5..0000000 --- a/gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch +++ /dev/null @@ -1,465 +0,0 @@ -From 7d7742477ad03f19a168c763b988a7807421e9ca Mon Sep 17 00:00:00 2001 -From: Vivien Malerba -Date: Sat, 17 Sep 2011 14:26:09 +0000 -Subject: Fixed nasty bug introduced in commit #036420a459b0bb241716cd9a14c3dd1eb2b21f63 - -which "Improved statement rewriting for NULL parameters", and in other -commits for each provider ---- -diff --git a/libgda/sqlite/gda-sqlite-provider.c b/libgda/sqlite/gda-sqlite-provider.c -index afeab3c..69ccd16 100644 ---- a/libgda/sqlite/gda-sqlite-provider.c -+++ b/libgda/sqlite/gda-sqlite-provider.c -@@ -2935,7 +2935,33 @@ gda_sqlite_provider_statement_execute (GdaServerProvider *provider, GdaConnectio - else if (!rstmt) - return NULL; - else { -+ /* The strategy here is to execute @rstmt using the prepared -+ * statement associcted to @stmt, but adapted to @rstmt, so all -+ * the column names, etc remain the same. -+ * -+ * The adaptation consists to replace SQLite specific information -+ * in the GdaSqlitePStmt object. -+ * -+ * The trick is to adapt @ps, then associate @ps with @rstmt, then -+ * execute @rstmt, and then undo the trick */ - GObject *obj; -+ GdaSqlitePStmt *tps; -+ if (!gda_sqlite_provider_statement_prepare (provider, cnc, -+ rstmt, error)) -+ return NULL; -+ tps = (GdaSqlitePStmt *) -+ gda_connection_get_prepared_statement (cnc, rstmt); -+ -+ /* adapt @ps with @tps's SQLite specific information */ -+ GdaSqlitePStmt hps; -+ hps.sqlite_stmt = ps->sqlite_stmt; /* save */ -+ ps->sqlite_stmt = tps->sqlite_stmt; /* override */ -+ hps.stmt_used = ps->stmt_used; /* save */ -+ ps->stmt_used = tps->stmt_used; /* override */ -+ g_object_ref (tps); -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps); -+ -+ /* execute rstmt (it will use @ps) */ - obj = gda_sqlite_provider_statement_execute (provider, cnc, - rstmt, params, - model_usage, -@@ -2943,15 +2969,14 @@ gda_sqlite_provider_statement_execute (GdaServerProvider *provider, GdaConnectio - last_inserted_row, - task_id, async_cb, - cb_data, error); -+ -+ /* revert adaptations */ -+ ps->sqlite_stmt = hps.sqlite_stmt; -+ ps->stmt_used = hps.stmt_used; -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps); -+ g_object_unref (tps); - g_object_unref (rstmt); -- if (GDA_IS_DATA_SELECT (obj)) { -- GdaPStmt *pstmt; -- g_object_get (obj, "prepared-stmt", &pstmt, NULL); -- if (pstmt) { -- gda_pstmt_set_gda_statement (pstmt, stmt); -- g_object_unref (pstmt); -- } -- } -+ - if (new_ps) - g_object_unref (ps); - pending_blobs_free_list (blobs_list); -diff --git a/providers/jdbc/gda-jdbc-provider.c b/providers/jdbc/gda-jdbc-provider.c -index 164e67f..c1192fb 100644 ---- a/providers/jdbc/gda-jdbc-provider.c -+++ b/providers/jdbc/gda-jdbc-provider.c -@@ -1429,9 +1429,49 @@ gda_jdbc_provider_statement_execute (GdaServerProvider *provider, GdaConnection - else if (!rstmt) - return NULL; - else { -- GObject *obj; -- g_object_unref (ps); - _gda_jdbc_release_jenv (jni_detach); -+ -+ /* The strategy here is to execute @rstmt using the prepared -+ * statement associcted to @stmt, but adapted to @rstmt, so all -+ * the column names, etc remain the same. -+ * -+ * The adaptation consists to replace Jdbc specific information -+ * in the GdaJdbcPStmt object. -+ * -+ * The trick is to adapt @ps, then associate @ps with @rstmt, then -+ * execute @rstmt, and then undo the trick */ -+ GObject *obj; -+ GdaJdbcPStmt *tps; -+ if (!gda_jdbc_provider_statement_prepare (provider, cnc, -+ rstmt, error)) { -+ g_object_unref (ps); -+ return NULL; -+ } -+ tps = (GdaJdbcPStmt *) -+ gda_connection_get_prepared_statement (cnc, rstmt); -+ -+ /* adapt @ps with @tps's Jdbc specific information */ -+ GdaJdbcPStmt hps; -+ hps.pstmt_obj = ps->pstmt_obj; /* save */ -+ ps->pstmt_obj = tps->pstmt_obj; /* override */ -+ g_object_ref (tps); -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps); -+ -+ /* execute rstmt (it will use @ps) */ -+ obj = gda_jdbc_provider_statement_execute (provider, cnc, -+ rstmt, params, -+ model_usage, -+ col_types, -+ last_inserted_row, -+ task_id, async_cb, -+ cb_data, error); -+ -+ /* revert adaptations */ -+ ps->pstmt_obj = hps.pstmt_obj; -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps); -+ g_object_unref (tps); -+ g_object_unref (rstmt); -+ - obj = gda_jdbc_provider_statement_execute (provider, cnc, - rstmt, params, - model_usage, -@@ -1440,14 +1480,7 @@ gda_jdbc_provider_statement_execute (GdaServerProvider *provider, GdaConnection - task_id, async_cb, - cb_data, error); - g_object_unref (rstmt); -- if (GDA_IS_DATA_SELECT (obj)) { -- GdaPStmt *pstmt; -- g_object_get (obj, "prepared-stmt", &pstmt, NULL); -- if (pstmt) { -- gda_pstmt_set_gda_statement (pstmt, stmt); -- g_object_unref (pstmt); -- } -- } -+ g_object_unref (ps); - return obj; - } - } -diff --git a/providers/mysql/gda-mysql-provider.c b/providers/mysql/gda-mysql-provider.c -index d581828..8baf0a3 100644 ---- a/providers/mysql/gda-mysql-provider.c -+++ b/providers/mysql/gda-mysql-provider.c -@@ -2304,8 +2304,35 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, - else if (!rstmt) - return NULL; - else { -- GObject *obj; - free_bind_param_data (mem_to_free); -+ -+ /* The strategy here is to execute @rstmt using the prepared -+ * statement associcted to @stmt, but adapted to @rstmt, so all -+ * the column names, etc remain the same. -+ * -+ * The adaptation consists to replace MySQL specific information -+ * in the GdaMysqlPStmt object. -+ * -+ * The trick is to adapt @ps, then associate @ps with @rstmt, then -+ * execute @rstmt, and then undo the trick */ -+ GObject *obj; -+ GdaMysqlPStmt *tps; -+ if (!gda_mysql_provider_statement_prepare (provider, cnc, -+ rstmt, error)) -+ return NULL; -+ tps = (GdaMysqlPStmt *) -+ gda_connection_get_prepared_statement (cnc, rstmt); -+ -+ /* adapt @ps with @tps's Mysql specific information */ -+ GdaMysqlPStmt hps; -+ hps.mysql_stmt = ps->mysql_stmt; /* save */ -+ ps->mysql_stmt = tps->mysql_stmt; /* override */ -+ hps.stmt_used = ps->stmt_used; /* save */ -+ ps->stmt_used = tps->stmt_used; /* override */ -+ g_object_ref (tps); -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps); -+ -+ /* execute rstmt (it will use @ps) */ - obj = gda_mysql_provider_statement_execute (provider, cnc, - rstmt, params, - model_usage, -@@ -2313,15 +2340,13 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, - last_inserted_row, - task_id, async_cb, - cb_data, error); -+ -+ /* revert adaptations */ -+ ps->mysql_stmt = hps.mysql_stmt; -+ ps->stmt_used = hps.stmt_used; -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps); -+ g_object_unref (tps); - g_object_unref (rstmt); -- if (GDA_IS_DATA_SELECT (obj)) { -- GdaPStmt *pstmt; -- g_object_get (obj, "prepared-stmt", &pstmt, NULL); -- if (pstmt) { -- gda_pstmt_set_gda_statement (pstmt, stmt); -- g_object_unref (pstmt); -- } -- } - return obj; - } - } -diff --git a/providers/oracle/gda-oracle-provider.c b/providers/oracle/gda-oracle-provider.c -index 1d40105..9d0f485 100644 ---- a/providers/oracle/gda-oracle-provider.c -+++ b/providers/oracle/gda-oracle-provider.c -@@ -1931,8 +1931,35 @@ gda_oracle_provider_statement_execute (GdaServerProvider *provider, GdaConnectio - else if (!rstmt) - return NULL; - else { -+ /* The strategy here is to execute @rstmt using the prepared -+ * statement associcted to @stmt, but adapted to @rstmt, so all -+ * the column names, etc remain the same. -+ * -+ * The adaptation consists to replace Oracle specific information -+ * in the GdaOraclePStmt object. -+ * -+ * The trick is to adapt @ps, then associate @ps with @rstmt, then -+ * execute @rstmt, and then undo the trick */ - GObject *obj; -- g_object_unref (ps); -+ GdaOraclePStmt *tps; -+ if (!gda_oracle_provider_statement_prepare (provider, cnc, -+ rstmt, error)) { -+ g_object_unref (ps); -+ return NULL; -+ } -+ tps = (GdaOraclePStmt *) -+ gda_connection_get_prepared_statement (cnc, rstmt); -+ -+ /* adapt @ps with @tps's Oracle specific information */ -+ GdaOraclePStmt hps; -+ hps.hstmt = ps->hstmt; /* save */ -+ ps->hstmt = tps->hstmt; /* override */ -+ hps.ora_values = ps->ora_values; /* save */ -+ ps->ora_values = tps->ora_values; /* override */ -+ g_object_ref (tps); -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps); -+ -+ /* execute rstmt (it will use @ps) */ - obj = gda_oracle_provider_statement_execute (provider, cnc, - rstmt, params, - model_usage, -@@ -1940,15 +1967,14 @@ gda_oracle_provider_statement_execute (GdaServerProvider *provider, GdaConnectio - last_inserted_row, - task_id, async_cb, - cb_data, error); -+ -+ /* revert adaptations */ -+ ps->hstmt = hps.hstmt; -+ ps->ora_values = hps.ora_values; -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps); -+ g_object_unref (tps); - g_object_unref (rstmt); -- if (GDA_IS_DATA_SELECT (obj)) { -- GdaPStmt *pstmt; -- g_object_get (obj, "prepared-stmt", &pstmt, NULL); -- if (pstmt) { -- gda_pstmt_set_gda_statement (pstmt, stmt); -- g_object_unref (pstmt); -- } -- } -+ g_object_unref (ps); - return obj; - } - } -diff --git a/providers/postgres/gda-postgres-provider.c b/providers/postgres/gda-postgres-provider.c -index 6adca14..85db58e 100644 ---- a/providers/postgres/gda-postgres-provider.c -+++ b/providers/postgres/gda-postgres-provider.c -@@ -2017,13 +2017,39 @@ gda_postgres_provider_statement_execute (GdaServerProvider *provider, GdaConnect - else if (!rstmt) - return NULL; - else { -- GObject *obj; - params_freev (param_values, param_mem, nb_params); - g_free (param_lengths); - g_free (param_formats); - if (transaction_started) - gda_connection_rollback_transaction (cnc, NULL, NULL); - -+ /* The strategy here is to execute @rstmt using the prepared -+ * statement associcted to @stmt, but adapted to @rstmt, so all -+ * the column names, etc remain the same. -+ * -+ * The adaptation consists to replace Postgresql specific information -+ * in the GdaPostgresPStmt object. -+ * -+ * The trick is to adapt @ps, then associate @ps with @rstmt, then -+ * execute @rstmt, and then undo the trick */ -+ GObject *obj; -+ GdaPostgresPStmt *tps; -+ if (!gda_postgres_provider_statement_prepare (provider, cnc, -+ rstmt, error)) -+ return NULL; -+ tps = (GdaPostgresPStmt *) -+ gda_connection_get_prepared_statement (cnc, rstmt); -+ -+ /* adapt @ps with @tps's SQLite specific information */ -+ GdaPostgresPStmt hps; -+ hps.pconn = ps->pconn; /* save */ -+ ps->pconn = tps->pconn; /* override */ -+ hps.prep_name = ps->prep_name; /* save */ -+ ps->prep_name = tps->prep_name; /* override */ -+ g_object_ref (tps); -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps); -+ -+ /* execute rstmt (it will use @ps) */ - obj = gda_postgres_provider_statement_execute (provider, cnc, - rstmt, params, - model_usage, -@@ -2031,15 +2057,13 @@ gda_postgres_provider_statement_execute (GdaServerProvider *provider, GdaConnect - last_inserted_row, - task_id, async_cb, - cb_data, error); -+ -+ /* revert adaptations */ -+ ps->pconn = hps.pconn; -+ ps->prep_name = hps.prep_name; -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps); -+ g_object_unref (tps); - g_object_unref (rstmt); -- if (GDA_IS_DATA_SELECT (obj)) { -- GdaPStmt *pstmt; -- g_object_get (obj, "prepared-stmt", &pstmt, NULL); -- if (pstmt) { -- gda_pstmt_set_gda_statement (pstmt, stmt); -- g_object_unref (pstmt); -- } -- } - return obj; - } - } -diff --git a/providers/skel-implementation/capi/gda-capi-provider.c b/providers/skel-implementation/capi/gda-capi-provider.c -index 653f9ea..764d027 100644 ---- a/providers/skel-implementation/capi/gda-capi-provider.c -+++ b/providers/skel-implementation/capi/gda-capi-provider.c -@@ -1181,7 +1181,31 @@ gda_capi_provider_statement_execute (GdaServerProvider *provider, GdaConnection - else if (!rstmt) - return NULL; - else { -+ /* The strategy here is to execute @rstmt using the prepared -+ * statement associcted to @stmt, but adapted to @rstmt, so all -+ * the column names, etc remain the same. -+ * -+ * The adaptation consists to replace Capi specific information -+ * in the GdaCapiPStmt object. -+ * -+ * The trick is to adapt @ps, then associate @ps with @rstmt, then -+ * execute @rstmt, and then undo the trick */ - GObject *obj; -+ GdaCapiPStmt *tps; -+ if (!gda_capi_provider_statement_prepare (provider, cnc, -+ rstmt, error)) -+ return NULL; -+ tps = (GdaCapiPStmt *) -+ gda_connection_get_prepared_statement (cnc, rstmt); -+ -+ /* adapt @ps with @tps's Capi specific information */ -+ GdaCapiPStmt hps; -+ /* TO ADD: hps.capi_stmt = ps->capi_stmt;*/ /* save */ -+ /* TO_ADD: ps->capi_stmt = tps->capi_stmt;*/ /* override */ -+ g_object_ref (tps); -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps); -+ -+ /* execute rstmt (it will use @ps) */ - obj = gda_capi_provider_statement_execute (provider, cnc, - rstmt, params, - model_usage, -@@ -1189,15 +1213,13 @@ gda_capi_provider_statement_execute (GdaServerProvider *provider, GdaConnection - last_inserted_row, - task_id, async_cb, - cb_data, error); -+ -+ /* revert adaptations */ -+ /* TO_ADD: ps->capi_stmt = hps.capi_stmt; */ -+ -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps); -+ g_object_unref (tps); - g_object_unref (rstmt); -- if (GDA_IS_DATA_SELECT (obj)) { -- GdaPStmt *pstmt; -- g_object_get (obj, "prepared-stmt", &pstmt, NULL); -- if (pstmt) { -- gda_pstmt_set_gda_statement (pstmt, stmt); -- g_object_unref (pstmt); -- } -- } - return obj; - } - } -diff --git a/providers/web/gda-web-provider.c b/providers/web/gda-web-provider.c -index 4500f01..9061126 100644 ---- a/providers/web/gda-web-provider.c -+++ b/providers/web/gda-web-provider.c -@@ -1572,25 +1572,49 @@ gda_web_provider_statement_execute (GdaServerProvider *provider, GdaConnection * - else if (!rstmt) - return NULL; - else { -- GObject *obj; -- g_object_unref (ps); - xmlFreeDoc (doc); -+ -+ /* The strategy here is to execute @rstmt using the prepared -+ * statement associcted to @stmt, but adapted to @rstmt, so all -+ * the column names, etc remain the same. -+ * -+ * The adaptation consists to replace Web specific information -+ * in the GdaWebPStmt object. -+ * -+ * The trick is to adapt @ps, then associate @ps with @rstmt, then -+ * execute @rstmt, and then undo the trick */ -+ GObject *obj; -+ GdaWebPStmt *tps; -+ if (!gda_web_provider_statement_prepare (provider, cnc, -+ rstmt, error)) { -+ g_object_unref (ps); -+ return NULL; -+ } -+ tps = (GdaWebPStmt *) -+ gda_connection_get_prepared_statement (cnc, rstmt); -+ -+ /* adapt @ps with @tps's Web specific information */ -+ GdaWebPStmt hps; -+ hps.pstmt_hash = ps->pstmt_hash; /* save */ -+ ps->pstmt_hash = tps->pstmt_hash; /* override */ -+ g_object_ref (tps); -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps); -+ -+ /* execute rstmt (it will use @ps) */ - obj = gda_web_provider_statement_execute (provider, cnc, -- rstmt, params, -- model_usage, -- col_types, -- last_inserted_row, -- task_id, async_cb, -- cb_data, error); -+ rstmt, params, -+ model_usage, -+ col_types, -+ last_inserted_row, -+ task_id, async_cb, -+ cb_data, error); -+ -+ /* revert adaptations */ -+ ps->pstmt_hash = hps.pstmt_hash; -+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps); -+ g_object_unref (tps); - g_object_unref (rstmt); -- if (GDA_IS_DATA_SELECT (obj)) { -- GdaPStmt *pstmt; -- g_object_get (obj, "prepared-stmt", &pstmt, NULL); -- if (pstmt) { -- gda_pstmt_set_gda_statement (pstmt, stmt); -- g_object_unref (pstmt); -- } -- } -+ g_object_unref (ps); - return obj; - } - } --- -cgit v0.9.0.2 diff --git a/gnome-extra/libgda/files/libgda-9999-disable-broken-tests.patch b/gnome-extra/libgda/files/libgda-9999-disable-broken-tests.patch deleted file mode 100644 index 1add00a..0000000 --- a/gnome-extra/libgda/files/libgda-9999-disable-broken-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/value-holders/check_holder.c b/tests/value-holders/check_holder.c -index d014131..289a9ca 100644 ---- a/tests/value-holders/check_holder.c -+++ b/tests/value-holders/check_holder.c -@@ -38,8 +38,8 @@ static gboolean test13 (GError **error); - TestFunc tests[] = { - test1, - test2, -- test3, -- test4, -+// test3, -+// test4, - test5, - test6, - test7, diff --git a/gnome-extra/libgda/files/libgda-9999-fix-build-order.patch b/gnome-extra/libgda/files/libgda-9999-fix-build-order.patch deleted file mode 100644 index cd2fbb5..0000000 --- a/gnome-extra/libgda/files/libgda-9999-fix-build-order.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am -index b3bf302..c7be5e1 100644 ---- a/libgda/sqlite/Makefile.am -+++ b/libgda/sqlite/Makefile.am -@@ -58,7 +58,8 @@ sqlitesources = \ - gda-sqlite.h \ - keywords_hash.h \ - gda-symbols-util.h \ -- gda-symbols-util.c -+ gda-symbols-util.c \ -+ $(BUILT_SOURCES) - - BUILT_SOURCES = xml_embedded.h keywords_hash.c - diff --git a/gnome-extra/libgda/libgda-4.99.4-r1.ebuild b/gnome-extra/libgda/libgda-4.99.4-r1.ebuild deleted file mode 100644 index acca81f..0000000 --- a/gnome-extra/libgda/libgda-4.99.4-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.99.4.ebuild,v 1.1 2011/09/30 19:27:46 nirbheek Exp $ - -EAPI="3" -GNOME2_LA_PUNT="yes" -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="xz" # remove when python eclass supports EAPI 4 -PYTHON_DEPEND="2" - -inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python - -DESCRIPTION="Gnome Database Access Library" -HOMEPAGE="http://www.gnome-db.org/" -LICENSE="GPL-2 LGPL-2" - -IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" -SLOT="5" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -# FIXME: sqlite is automagic, but maybe it is a hard-dep -# FIXME: autoconf is a hell of inconsistencies -RDEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.16:2 - >=dev-libs/libxml2-2 - dev-libs/libxslt - dev-libs/libunique:3 - sys-libs/readline - sys-libs/ncurses - berkdb? ( sys-libs/db ) - !bindist? ( firebird? ( dev-db/firebird ) ) - gtk? ( - >=x11-libs/gtk+-3.0.0:3 - canvas? ( x11-libs/goocanvas:2.0 ) - sourceview? ( x11-libs/gtksourceview:3.0 ) - graphviz? ( media-gfx/graphviz ) - ) - gnome-keyring? ( || ( gnome-base/libgnome-keyring =net-libs/libsoup-2.24:2.4 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) - json? ( dev-libs/json-glib ) - ldap? ( net-nds/openldap ) - mdb? ( >app-office/mdbtools-0.5 ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-base ) - ssl? ( dev-libs/openssl ) - >=dev-db/sqlite-3.6.22:3" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.18 - >=dev-util/intltool-0.35.5 - >=app-text/gnome-doc-utils-0.9 - doc? ( >=dev-util/gtk-doc-1 )" - -# XXX: some tests fail when run from portage (but pass when building by hand) -RESTRICT="test" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - - if use canvas || use graphviz || use sourceview; then - if ! use gtk; then - ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag." - ewarn "Disabling for now." - G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview" - else - G2CONF="${G2CONF} - $(use_with canvas goocanvas) - $(use_with graphviz) - $(use_with sourceview gtksourceview)" - fi - fi - - G2CONF="${G2CONF} - --with-unique - --disable-scrollkeeper - --disable-static - --enable-system-sqlite - $(use_with berkdb bdb /usr) - $(use_with gnome-keyring) - $(use_with gtk ui) - $(use_with http libsoup) - $(use_enable introspection) - $(use_with java java $JAVA_HOME) - $(use_enable json) - $(use_with ldap) - $(use_with mdb mdb /usr) - $(use_with mysql mysql /usr) - $(use_with postgres postgres /usr) - $(use_enable ssl crypto)" - - if use bindist; then - # firebird license is not GPL compatible - G2CONF="${G2CONF} --without-firebird" - else - G2CONF="${G2CONF} $(use_with firebird firebird /usr)" - fi - - use berkdb && append-cppflags "-I$(db_includedir)" - use oci8 || G2CONF="${G2CONF} --without-oracle" - - # Not in portage - G2CONF="${G2CONF} - --disable-default-binary" - - export XDG_DATA_HOME="${T}/.local" -} - -src_prepare() { - # Fix build order for generated content, upstream #630958 - #epatch "${FILESDIR}/${PN}-9999-fix-build-order.patch" - - # Fix compilation failure of keyword_hash.c, upstream #630959 - #epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch" - - # Upstream patch to fix a serious statement rewriting bug, in next release - epatch "${FILESDIR}/${PN}-4.99.4-statement-rewriting-fix.patch" - - # Disable broken tests so we can check the others - epatch "${FILESDIR}/${PN}-4.99.4-disable-broken-tests.patch" - - # Prevent file collisions with libgda:4 - epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch" - epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch" - epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch" - # Move files with mv (since epatch can't handle rename diffs) and - # update pre-generated gtk-doc files - local f - for f in tools/browser/doc/gda-browser* ; do - mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed" - done - for f in tools/browser/doc/html/gda-browser.devhelp* ; do - sed -e 's:name="gda-browser":name="gda-browser-5.0":' \ - -i ${f} || die "sed ${f} failed" - mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed" - done - for f in control-center/data/*_gda-control-center.png ; do - mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} || - die "mv ${f} failed" - done - - python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf} - - eautoreconf - gnome2_src_prepare -} - -src_test() { - emake check XDG_DATA_HOME="${T}/.local" || die "tests failed" -} - -pkg_postinst() { - gnome2_pkg_postinst - local d - for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do - python_mod_optimize ${d} - done -} - -pkg_postrm() { - gnome2_pkg_postrm - local d - for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do - python_mod_cleanup ${d} - done -} -- cgit v1.2.3-18-g5258