[openoffice.org/f14/master] Revert to using gtk2 for F14
Caolan McNamara
caolanm at fedoraproject.org
Wed Aug 11 07:59:41 UTC 2010
commit b880c6ac72ebea494cc80edbd2292ae4496eddd4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 11 08:59:37 2010 +0100
Revert to using gtk2 for F14
openoffice.org.spec | 13 ++-
workspace.gtk3.patch | 258 +------------------------------------------------
2 files changed, 13 insertions(+), 258 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 65d4565..947b286 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -64,7 +64,7 @@ BuildRequires: neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
BuildRequires: libXext-devel, libXt-devel, libICE-devel, libjpeg-devel, make
BuildRequires: gecko-devel, libwpd-devel, hunspell-devel, unixODBC-devel
BuildRequires: db4-devel, sane-backends-devel, libicu-devel, perl-Archive-Zip
-BuildRequires: freetype-devel, gtk3-devel, desktop-file-utils, hyphen-devel
+BuildRequires: freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel
BuildRequires: evolution-data-server-devel, libtextcat-devel, nss-devel
BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, openssl-devel
BuildRequires: mdds-devel, lpsolve-devel, hsqldb, bsh, lucene, lucene-contrib
@@ -150,10 +150,10 @@ Requires: liberation-sans-fonts >= 1.0, liberation-serif-fonts >= 1.0, liberatio
Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
Requires: hunspell-en, hyphen-en, hyphen >= 2.4, autocorr-en
Requires: lucene
-Requires(pre): gtk3 >= 2.9.4
-Requires(post): gtk3 >= 2.9.4
-Requires(preun): gtk3 >= 2.9.4
-Requires(postun): gtk3 >= 2.9.4
+Requires(pre): gtk2 >= 2.9.4
+Requires(post): gtk2 >= 2.9.4
+Requires(preun): gtk2 >= 2.9.4
+Requires(postun): gtk2 >= 2.9.4
Obsoletes: openoffice.org < 1.9.0
Obsoletes: openoffice.org-libs < 1.9.0
Obsoletes: openoffice.org-i18n < 1.9.0
@@ -3783,9 +3783,10 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
%endif
%changelog
-* Tue Aug 10 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.3
+* Wed Aug 11 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.3
- Resolves: rhbz#620574 Presentation for coccinelle: Start slide is a
complete mess (dtardon)
+- Revert to using gtk2 for F14
* Mon Aug 09 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.2
- Resolves: rhbz#601621 avoid using mmap for copying files
diff --git a/workspace.gtk3.patch b/workspace.gtk3.patch
index 6af8795..381217d 100644
--- a/workspace.gtk3.patch
+++ b/workspace.gtk3.patch
@@ -273,43 +273,6 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair>& _rFilters );
void updateCurrentFilterFromName(const gchar* filtername);
void unselect_type();
---- vcl.orig/unx/gtk/a11y/makefile.mk 2010-05-29 11:29:16.000000000 +0100
-+++ vcl/unx/gtk/a11y/makefile.mk 2010-05-29 11:30:47.000000000 +0100
-@@ -50,7 +50,7 @@
-
- .IF "$(ENABLE_GTK)" != ""
-
--PKGCONFIG_MODULES=gtk+-2.0
-+PKGCONFIG_MODULES=gtk+-3.0
- .INCLUDE : pkg_config.mk
-
- CFLAGS+=-DVERSION=$(EMQ)"$(UPD)$(LAST_MINOR)$(EMQ)"
---- vcl.orig/unx/gtk/app/makefile.mk 2010-05-29 11:29:17.000000000 +0100
-+++ vcl/unx/gtk/app/makefile.mk 2010-05-29 11:30:40.000000000 +0100
-@@ -50,7 +50,7 @@
-
- .IF "$(ENABLE_GTK)" != ""
-
--PKGCONFIG_MODULES=gtk+-2.0
-+PKGCONFIG_MODULES=gtk+-3.0
- .INCLUDE : pkg_config.mk
-
- SLOFILES=\
---- vcl.orig/unx/gtk/gdi/makefile.mk 2010-05-29 11:29:17.000000000 +0100
-+++ vcl/unx/gtk/gdi/makefile.mk 2010-05-29 11:30:44.000000000 +0100
-@@ -47,9 +47,11 @@
-
- .IF "$(ENABLE_GTK)" != ""
-
--PKGCONFIG_MODULES=gtk+-2.0
-+PKGCONFIG_MODULES=gtk+-3.0
- .INCLUDE : pkg_config.mk
-
-+CFLAGS+=-UGSEAL_ENABLE
-+
- SLOFILES=$(SLO)$/salnativewidgets-gtk.obj
- EXCEPTIONSFILES=$(SLO)$/salnativewidgets-gtk.obj
-
--- vcl.orig/unx/gtk/window/gtkframe.cxx 2010-05-29 11:29:16.000000000 +0100
+++ vcl/unx/gtk/window/gtkframe.cxx 2010-05-29 12:02:19.000000000 +0100
@@ -79,6 +79,14 @@
@@ -332,7 +295,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
if( m_pRegion )
- gdk_region_destroy( m_pRegion );
-+ cairo_region_destroy( m_pRegion );
++ gdk_region_destroy( m_pRegion );
if( m_hBackgroundPixmap )
{
@@ -599,7 +562,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
if( m_pRegion )
- gdk_region_destroy( m_pRegion );
-+ cairo_region_destroy( m_pRegion );
++ gdk_region_destroy( m_pRegion );
if( m_pFixedContainer )
gtk_widget_destroy( GTK_WIDGET(m_pFixedContainer) );
if( m_pWindow )
@@ -625,8 +588,8 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
if( m_pRegion )
- gdk_region_destroy( m_pRegion );
- m_pRegion = gdk_region_new();
-+ cairo_region_destroy( m_pRegion );
-+ m_pRegion = cairo_region_create();
++ gdk_region_destroy( m_pRegion );
++ m_pRegion = gdk_region_new();
}
void GtkSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
@@ -635,7 +598,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
aRect.height = nHeight;
- gdk_region_union_with_rect( m_pRegion, &aRect );
-+ cairo_region_union_rectangle( m_pRegion, &aRect );
++ gdk_region_union_with_rect( m_pRegion, &aRect );
}
}
@@ -764,72 +727,6 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
gtk_im_context_focus_in( m_pIMContext );
m_pFrame->getDisplay()->GetXLib()->PopXErrorLevel();
m_bFocused = true;
---- vcl.orig/unx/gtk/window/makefile.mk 2010-05-29 11:29:16.000000000 +0100
-+++ vcl/unx/gtk/window/makefile.mk 2010-05-29 11:30:51.000000000 +0100
-@@ -50,7 +50,7 @@
-
- .IF "$(ENABLE_GTK)" != ""
-
--PKGCONFIG_MODULES=gtk+-2.0
-+PKGCONFIG_MODULES=gtk+-3.0
- .IF "$(ENABLE_DBUS)" != ""
- CDEFS+=-DENABLE_DBUS
- PKGCONFIG_MODULES+= dbus-glib-1
---- vcl.orig/util/makefile.mk 2010-05-29 11:28:58.000000000 +0100
-+++ vcl/util/makefile.mk 2010-05-29 11:30:59.000000000 +0100
-@@ -350,7 +350,7 @@
-
- # gtk plugin
- .IF "$(ENABLE_GTK)" != ""
--PKGCONFIG_MODULES=gtk+-2.0 gthread-2.0
-+PKGCONFIG_MODULES=gtk+-3.0 gthread-2.0
- .IF "$(ENABLE_DBUS)" != ""
- PKGCONFIG_MODULES+= dbus-glib-1
- .ENDIF
---- extensions.orig/source/nsplugin/source/makefile.mk 2010-05-29 21:22:06.000000000 +0100
-+++ extensions/source/nsplugin/source/makefile.mk 2010-05-29 21:23:13.000000000 +0100
-@@ -52,7 +52,7 @@
- .IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
- INC+= -DNP_LINUX
- .ENDIF
--PKGCONFIG_MODULES=gtk+-2.0
-+PKGCONFIG_MODULES=gtk+-3.0
- .INCLUDE: pkg_config.mk
- .ENDIF # "$(ENABLE_GTK)"==""
- .ENDIF # "$(GUI)"=="UNX"
---- extensions.orig/source/plugin/util/makefile.pmk 2010-05-29 21:22:06.000000000 +0100
-+++ extensions/source/plugin/util/makefile.pmk 2010-05-29 21:23:16.000000000 +0100
-@@ -35,7 +35,7 @@
-
- .IF "$(GUIBASE)" == "unx" && "$(ENABLE_GTK)" == "TRUE"
- CDEFS+=-DENABLE_GTK
--PKGCONFIG_MODULES+=gtk+-2.0 gthread-2.0
-+PKGCONFIG_MODULES+=gtk+-3.0 gthread-2.0
- .ENDIF
-
- .IF "$(GUIBASE)" == "aqua"
---- fpicker.orig/source/unx/gnome/makefile.mk 2010-05-29 21:22:49.000000000 +0100
-+++ fpicker/source/unx/gnome/makefile.mk 2010-05-29 21:24:14.000000000 +0100
-@@ -46,16 +46,16 @@
-
- .ELSE # we build for GNOME
-
--PKGCONFIG_MODULES=gtk+-2.0
-+PKGCONFIG_MODULES=gtk+-3.0
- .INCLUDE : pkg_config.mk
-
- # check gtk version
--GTK_TWO_FOUR:=$(shell @$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo ok)
-+GTK_TWO_FOUR:=$(shell @$(PKG_CONFIG) --exists 'gtk+-3.0 >= 2.4.0' && echo ok)
- .IF "$(GTK_TWO_FOUR)" != "ok"
-
- dummy:
- @echo "Cannot build gtk filepicker because"
-- @$(PKG_CONFIG) --print-errors --exists 'gtk+-2.0 >= 2.4.0'
-+ @$(PKG_CONFIG) --print-errors --exists 'gtk+-3.0 >= 2.4.0'
-
- .ELSE
-
--- fpicker.orig/source/unx/gnome/SalGtkFilePicker.cxx 2010-05-29 21:22:49.000000000 +0100
+++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2010-05-29 21:26:05.000000000 +0100
@@ -602,7 +602,11 @@
@@ -893,7 +790,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
+#if GTK_CHECK_VERSION(2,90,0)
+ return gtk_widget_get_window(widget);
+#else
-+ return widget->window
++ return widget->window;
+#endif
+}
+
@@ -981,42 +878,6 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
---- libegg.orig/source/makefile.mk 2010-05-29 21:27:29.000000000 +0100
-+++ libegg/source/makefile.mk 2010-05-30 12:45:54.000000000 +0100
-@@ -40,7 +40,7 @@
- .IF "$(L10N_framework)"==""
- .IF "$(ENABLE_GTK)"!=""
-
--PKGCONFIG_MODULES=gtk+-2.0 gdk-2.0
-+PKGCONFIG_MODULES=gtk+-3.0 gdk-3.0
- .INCLUDE: pkg_config.mk
- CFLAGS+=$(PKGCONFIG_CFLAGS)
-
---- scp2.orig/source/ooo/makefile.mk 2010-05-29 21:24:45.000000000 +0100
-+++ scp2/source/ooo/makefile.mk 2010-05-29 21:26:42.000000000 +0100
-@@ -63,9 +63,9 @@
- .IF "$(GUI)"=="UNX"
- .IF "$(ENABLE_GTK)" != ""
- SCPDEFS+=-DENABLE_GTK
--PKGCONFIG_MODULES=gtk+-2.0
-+PKGCONFIG_MODULES=gtk+-3.0
- .INCLUDE: pkg_config.mk
--GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
-+GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-3.0 >= 2.4.0' && echo YES)
- .IF "$(GTK_TWO_FOUR)" != ""
- SCPDEFS+=-DGTK_TWO_FOUR
- .ENDIF
---- sfx2.orig/source/appl/makefile.mk 2010-05-29 21:22:29.000000000 +0100
-+++ sfx2/source/appl/makefile.mk 2010-05-30 12:54:53.000000000 +0100
-@@ -52,7 +52,7 @@
- .IF "$(GUI)"=="UNX"
- CDEFS+=-DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST)
- .IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-- PKGCONFIG_MODULES=gtk+-2.0
-+ PKGCONFIG_MODULES=gtk+-3.0
- .INCLUDE: pkg_config.mk
- CFLAGS+=$(PKGCONFIG_CFLAGS)
- CFLAGS+=-DENABLE_QUICKSTART_APPLET
--- sfx2.orig/source/appl/shutdowniconunx.cxx 2010-05-29 21:22:29.000000000 +0100
+++ sfx2/source/appl/shutdowniconunx.cxx 2010-05-30 12:59:35.000000000 +0100
@@ -302,18 +302,34 @@
@@ -1068,46 +929,6 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
GtkWidget *pIconImage = gtk_image_new();
gtk_container_add( GTK_CONTAINER( pParent ), pIconImage );
---- sfx2.orig/util/makefile.mk 2010-05-29 21:22:29.000000000 +0100
-+++ sfx2/util/makefile.mk 2010-05-30 12:54:56.000000000 +0100
-@@ -140,7 +140,7 @@
- # gtk quick-starter
- .IF "$(GUI)"=="UNX"
- .IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
--PKGCONFIG_MODULES=gtk+-2.0
-+PKGCONFIG_MODULES=gtk+-3.0
- .INCLUDE: pkg_config.mk
- CFLAGS+=$(PKGCONFIG_CFLAGS)
-
---- configure.in 2010-05-27 08:08:18.000000000 +0100
-+++ configure.in 2010-05-29 11:33:43.000000000 +0100
-@@ -4574,7 +4577,7 @@
- elif test "$_os" = "Darwin"; then
- if test "$MOZILLA_TOOLKIT" = "gtk2"; then
- AC_MSG_NOTICE([checking whether mozilla can be built...])
-- PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build mozilla]), AC_MSG_ERROR([Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages]))
-+ PKG_CHECK_MODULES(MOZGTK2, gtk+-3.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build mozilla]), AC_MSG_ERROR([Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages]))
- else
- PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3, MOZIDL="TRUE", MOZIDL="")
- if test -z "$MOZIDL"; then
-@@ -4584,7 +4587,7 @@
- else
- # Generic Unix/Linux section
- if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-- PKG_CHECK_MODULES(MOZLIBREQ, gtk+-2.0, MOZGTK="TRUE", MOZGTK="")
-+ PKG_CHECK_MODULES(MOZLIBREQ, gtk+-3.0, MOZGTK="TRUE", MOZGTK="")
- if test -z "$MOZGTK"; then
- AC_MSG_ERROR([GTK2 is needed to build mozilla.])
- fi
-@@ -5643,7 +5641,7 @@
- if test "$test_gtk" = "yes"; then
-
- if test "$ENABLE_GTK" = "TRUE" ; then
-- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
-+ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
- BUILD_TYPE="$BUILD_TYPE GTK"
-
- if test "x$enable_systray" = "xyes"; then
--- vcl.orig/unx/gtk/app/gtkdata.cxx 2010-06-14 19:51:39.500810695 +0100
+++ vcl/unx/gtk/app/gtkdata.cxx 2010-06-15 10:07:16.669799057 +0100
@@ -217,11 +217,12 @@
@@ -4497,51 +4318,6 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
m_aSystemData.pShellWidget = GTK_WIDGET(pParent->getWindow());
g_signal_connect( G_OBJECT(m_pSocket), "button-press-event", G_CALLBACK(signalButton), this );
-@@ -83,7 +84,7 @@
- GtkSalObject::~GtkSalObject()
- {
- if( m_pRegion )
-- gdk_region_destroy( m_pRegion );
-+ cairo_region_destroy( m_pRegion );
- if( m_pSocket )
- {
- // remove socket from parent frame's fixed container
-@@ -101,7 +102,7 @@
- void GtkSalObject::ResetClipRegion()
- {
- if( m_pSocket )
-- gdk_window_shape_combine_region( m_pSocket->window, NULL, 0, 0 );
-+ gdk_window_shape_combine_region( widget_get_window(m_pSocket), NULL, 0, 0 );
- }
-
- USHORT GtkSalObject::GetClipRegionType()
-@@ -112,8 +113,8 @@
- void GtkSalObject::BeginSetClipRegion( ULONG )
- {
- if( m_pRegion )
-- gdk_region_destroy( m_pRegion );
-- m_pRegion = gdk_region_new();
-+ cairo_region_destroy( m_pRegion );
-+ m_pRegion = cairo_region_create();
- }
-
- void GtkSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
-@@ -124,13 +125,13 @@
- aRect.width = nWidth;
- aRect.height = nHeight;
-
-- gdk_region_union_with_rect( m_pRegion, &aRect );
-+ cairo_region_union_rectangle( m_pRegion, &aRect );
- }
-
- void GtkSalObject::EndSetClipRegion()
- {
- if( m_pSocket )
-- gdk_window_shape_combine_region( m_pSocket->window, m_pRegion, 0, 0 );
-+ gdk_window_shape_combine_region( widget_get_window(m_pSocket), m_pRegion, 0, 0 );
- }
-
- void GtkSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
--- fpicker.orig/source/unx/gnome/SalGtkPicker.cxx 2010-05-26 17:30:44.000000000 +0100
+++ fpicker/source/unx/gnome/SalGtkPicker.cxx 2010-07-01 12:51:05.000000000 +0100
@@ -155,7 +157,11 @@
@@ -4622,25 +4398,3 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
static GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event,
GdkEvent* event,
gpointer data );
---- vcl.orig/unx/inc/plugins/gtk/gtkframe.hxx 2010-07-13 16:17:08.000000000 +0100
-+++ vcl/unx/inc/plugins/gtk/gtkframe.hxx 2010-07-13 16:16:56.000000000 +0100
-@@ -195,7 +195,7 @@
- Size m_aMinSize;
- Rectangle m_aRestorePosSize;
-
-- GdkRegion* m_pRegion;
-+ cairo_region_t* m_pRegion;
-
- void Init( SalFrame* pParent, ULONG nStyle );
- void Init( SystemParentData* pSysData );
---- vcl.orig/unx/inc/plugins/gtk/gtkobject.hxx 2010-07-13 16:18:03.000000000 +0100
-+++ vcl/unx/inc/plugins/gtk/gtkobject.hxx 2010-07-13 16:17:47.000000000 +0100
-@@ -37,7 +37,7 @@
- {
- SystemChildData m_aSystemData;
- GtkWidget* m_pSocket;
-- GdkRegion* m_pRegion;
-+ cairo_region_t* m_pRegion;
-
- // signals
- static gboolean signalButton( GtkWidget*, GdkEventButton*, gpointer );
More information about the scm-commits
mailing list