mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump minimum gtk version to 2.10

Browse Source 
That is the version available in RHEL 5. The configure change for
telepathy has been changed for consistency only.

Change-Id: I664901dd2bbcc75f6f6fb84940f3fa85d69f57dd
Reviewed-on: https://gerrit.libreoffice.org/13369
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Riccardo Magliocchetti
2014-12-07 21:33:08 +01:00
committed by Caolán McNamara
parent 127b0926b5
commit fe95c62b39
4 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -10051,20 +10051,14 @@ ENABLE_SYSTRAY_GTK=""
if test "$test_gtk" = "yes"; then if test "$test_gtk" = "yes"; then
if test "$ENABLE_GTK" = "TRUE"; 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+-2.0 >= 2.10.0 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]))
GTK_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") GTK_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages])) PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
BUILD_TYPE="$BUILD_TYPE GTK" BUILD_TYPE="$BUILD_TYPE GTK"
GTHREAD_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") GTHREAD_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
AC_MSG_CHECKING([whether to enable the systray quickstarter])
if test "x$enable_systray" = "xyes"; then if test "x$enable_systray" = "xyes"; then
AC_MSG_RESULT([yes]) ENABLE_SYSTRAY_GTK="TRUE"
PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0,
[ ENABLE_SYSTRAY_GTK="TRUE" ],
[ ENABLE_SYSTRAY_GTK="" ])
else
AC_MSG_RESULT([no])
fi fi
AC_MSG_CHECKING([whether to enable Gtk print dialog support]) AC_MSG_CHECKING([whether to enable Gtk print dialog support])
@@ -10116,7 +10110,7 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_telepathy" = "yes";
ENABLE_TELEPATHY="TRUE" ENABLE_TELEPATHY="TRUE"
AC_DEFINE(ENABLE_TELEPATHY) AC_DEFINE(ENABLE_TELEPATHY)
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.18.0 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 gtk+-2.0 >= 2.4 ) PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.18.0 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 gtk+-2.0 >= 2.10 )
TELEPATHY_CFLAGS=$(printf '%s' "$TELEPATHY_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") TELEPATHY_CFLAGS=$(printf '%s' "$TELEPATHY_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])

12
vcl/unx/gtk/app/gtkinst.cxx
View File

@@ -244,22 +244,10 @@ void GtkInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUStri
sGtkURL = OString(g_uri); sGtkURL = OString(g_uri);
g_free(g_uri); g_free(g_uri);
} }
#if GTK_CHECK_VERSION(2,10,0)
GtkRecentManager *manager = gtk_recent_manager_get_default (); GtkRecentManager *manager = gtk_recent_manager_get_default ();
gtk_recent_manager_add_item (manager, sGtkURL.getStr()); gtk_recent_manager_add_item (manager, sGtkURL.getStr());
(void)rMimeType; (void)rMimeType;
(void)rDocumentService; (void)rDocumentService;
#else
static getDefaultFnc sym_gtk_recent_manager_get_default =
(getDefaultFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_get_default" );
static addItemFnc sym_gtk_recent_manager_add_item =
(addItemFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_add_item");
if (sym_gtk_recent_manager_get_default && sym_gtk_recent_manager_add_item)
sym_gtk_recent_manager_add_item(sym_gtk_recent_manager_get_default(), sGtkURL.getStr());
else
X11SalInstance::AddToRecentDocumentList(rFileUrl, rMimeType, rDocumentService);
#endif
} }
SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,

10
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
View File

@@ -4206,18 +4206,8 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
#if !GTK_CHECK_VERSION(2,9,0)
static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) =
(cairo_font_options_t*(*)(GdkScreen*))osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gdk_screen_get_font_options" );
if( gdk_screen_get_font_options != NULL )
{
const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options( pScreen );
aStyleSet.SetCairoFontOptions( pNewOptions );
}
#else
const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options( pScreen ); const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options( pScreen );
aStyleSet.SetCairoFontOptions( pNewOptions ); aStyleSet.SetCairoFontOptions( pNewOptions );
#endif
// finally update the collected settings // finally update the collected settings
rSettings.SetStyleSettings( aStyleSet ); rSettings.SetStyleSettings( aStyleSet );

7
vcl/unx/gtk/window/gtksalframe.cxx
View File

@@ -97,13 +97,6 @@
#include <config_folders.h> #include <config_folders.h>
// make compile on gtk older than 2.10
#if GTK_MINOR_VERSION < 10
#define GDK_SUPER_MASK (1 << 26)
#define GDK_HYPER_MASK (1 << 27)
#define GDK_META_MASK (1 << 28)
#endif
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,0,0)
#define IS_WIDGET_REALIZED gtk_widget_get_realized #define IS_WIDGET_REALIZED gtk_widget_get_realized
#define IS_WIDGET_MAPPED gtk_widget_get_mapped #define IS_WIDGET_MAPPED gtk_widget_get_mapped