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

Revert "GdkPrinter seems optional on Gtk3, too"

Browse Source 
This reverts commit 88a4a8d997.

Sorry, seemed to be an intermittent local problem.
This commit is contained in:
Thorsten Behrens
2011-12-06 18:08:18 +01:00
parent a25a01361e
commit 1a81ca45ea
6 changed files with 6 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
RepositoryExternal.mk
View File

@@ -660,29 +660,6 @@ endif
endef
define gb_LinkTarget__use_gtk3
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(GTK3_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(GTK3_LIBS))
ifeq ($(ENABLE_GTK3_PRINT),TRUE)
$(call gb_LinkTarget_add_defs,$(1),-DENABLE_GTK3_PRINT)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(GTK3_PRINT_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(GTK3_PRINT_LIBS))
endif
endef
define gb_LinkTarget__use_gthread
$(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))

12
configure.in
View File

@@ -7003,32 +7003,20 @@ R=""
GTK3_CFLAGS=""
GTK3_LIBS=""
ENABLE_GTK3=""
GTK3_PRINT_CFLAGS=""
GTK3_PRINT_LIBS=""
ENABLE_GTK3_PRINT=""
if test "x$enable_gtk3" = "xyes"; then
if test "$with_system_cairo" != yes; then
echo "System cairo required for gtk3 support, please use --with-system-cairo"
fi
PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
if test "x$ENABLE_GTK3" = "xTRUE"; then
R="gtk3"
else
AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
fi
AC_MSG_CHECKING([whether to enable Gtk3 print dialog support])
PKG_CHECK_MODULES([GTK3_PRINT], [gtk+-unix-print-3.0 >= 3.2.0],
[ENABLE_GTK3_PRINT="TRUE"],
[ENABLE_GTK3_PRINT=""])
fi
AC_SUBST(GTK3_LIBS)
AC_SUBST(GTK3_CFLAGS)
AC_SUBST(ENABLE_GTK3)
AC_SUBST(GTK3_PRINT_CFLAGS)
AC_SUBST(GTK3_PRINT_LIBS)
AC_SUBST(ENABLE_GTK3_PRINT)
AC_MSG_CHECKING([which VCLplugs shall be built])
ENABLE_GTK=""

3
set_soenv.in
View File

@@ -1548,9 +1548,6 @@ ToFile( "DBUS_LIBS", "@DBUS_LIBS@", "e" );
ToFile( "ENABLE_GTK_PRINT", "@ENABLE_GTK_PRINT@", "e" );
ToFile( "GTK_PRINT_CFLAGS", "@GTK_PRINT_CFLAGS@", "e" );
ToFile( "GTK_PRINT_LIBS", "@GTK_PRINT_LIBS@", "e" );
ToFile( "ENABLE_GTK3_PRINT", "@ENABLE_GTK3_PRINT@", "e" );
ToFile( "GTK3_PRINT_CFLAGS", "@GTK3_PRINT_CFLAGS@", "e" );
ToFile( "GTK3_PRINT_LIBS", "@GTK3_PRINT_LIBS@", "e" );
ToFile( "ENABLE_GCONF", "@ENABLE_GCONF@", "e" );
ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" );
ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );

10
vcl/Library_vclplug_gtk3.mk
View File

@@ -82,7 +82,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
$(eval $(call gb_Library_use_externals,vclplug_gtk3,\
dbus \
gtk3 \
))
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
@@ -107,7 +106,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/unx/gtk3/app/gtk3gtkinst \
vcl/unx/gtk3/app/gtk3gtksys \
vcl/unx/gtk3/app/gtk3fpicker \
vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk \
vcl/unx/gtk3/gdi/gtk3salprn-gtk \
vcl/unx/gtk3/window/gtk3gtkframe \
vcl/unx/gtk3/window/gtk3gtkobject \
vcl/headless/svpbmp \
@@ -119,13 +120,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/headless/svpvd \
))
ifeq ($(ENABLE_GTK3_PRINT),TRUE)
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \
vcl/unx/gtk3/gdi/gtk3salprn-gtk \
))
endif
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
dl \

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

@@ -401,7 +401,7 @@ void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const r
SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData )
{
#if defined ENABLE_GTK_PRINT || defined ENABLE_GTK3_PRINT
#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
mbPrinterInit = true;
// create and initialize SalInfoPrinter
PspSalInfoPrinter* pPrinter = new GtkSalInfoPrinter;
@@ -414,7 +414,7 @@ SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
SalPrinter* GtkInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter )
{
#if defined ENABLE_GTK_PRINT || defined ENABLE_GTK3_PRINT
#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
mbPrinterInit = true;
fprintf(stderr, "gtk printer\n");
return new GtkSalPrinter( pInfoPrinter );

4
vcl/unx/gtk/inc/gtkprintwrapper.hxx
View File

@@ -33,7 +33,7 @@
#include <gtk/gtk.h>
#if defined ENABLE_GTK_PRINT || defined ENABLE_GTK3_PRINT
#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
#include <gtk/gtkunixprint.h>
#if !GTK_CHECK_VERSION(3,0,0)
@@ -49,7 +49,7 @@ namespace unx
class GtkPrintWrapper : private boost::noncopyable
{
#if defined ENABLE_GTK_PRINT || defined ENABLE_GTK3_PRINT
#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
public:
GtkPrintWrapper();
~GtkPrintWrapper();