Proactively fix before the upcoming major gtk+3 update.

This commit is contained in:
ajacoutot 2013-09-25 12:26:46 +00:00
parent b6b0fa8019
commit 9aad0b8dc0
3 changed files with 47 additions and 3 deletions

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-avahi-ui_Makefile_in,v 1.1 2013/09/25 12:27:12 ajacoutot Exp $
Allow building with deprecated GTK+ symbols
https://bugzilla.redhat.com/show_bug.cgi?id=1001676
--- avahi-ui/Makefile.in.orig Wed Sep 25 09:13:06 2013
+++ avahi-ui/Makefile.in Wed Sep 25 09:13:35 2013
@@ -464,8 +464,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
# This cool debug trap works on i386/gcc only
-AM_CFLAGS = -I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1 \
+AM_CFLAGS = -I$(top_srcdir) \
'-DDEBUG_TRAP=__asm__("int $$3")' $(am__append_1)
pkglibdatadir = $(libdir)/avahi
desktopdir = $(datadir)/applications

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-Makefile,v 1.1 2013/09/25 12:26:46 ajacoutot Exp $
Fix build with gtk+3 >= 3.10.0
--- Makefile.orig Wed Sep 25 13:52:42 2013
+++ Makefile Wed Sep 25 13:52:56 2013
@@ -11,7 +11,7 @@ SRCS+= history.c completion.c tldlist.c externaleditor
CFLAGS+= -O2 -Wall -Wno-format-extra-args -Wunused -Wextra -Wno-unused-parameter
CFLAGS+= -Wno-missing-field-initializers -Wno-sign-compare
CFLAGS+= -Wno-deprecated-declarations -Wfloat-equal ${DEBUG}
-CFLAGS+= -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE
+CFLAGS+= -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGSEAL_ENABLE
CFLAGS+= -I. -I${.CURDIR}
LDADD= -lutil
GTK_VERSION ?= gtk3

View File

@ -1,6 +1,18 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2013/03/27 14:07:19 bcallah Exp $
--- CMakeLists.txt.orig Wed Mar 27 01:10:05 2013
+++ CMakeLists.txt Wed Mar 27 01:10:15 2013
$OpenBSD: patch-CMakeLists_txt,v 1.2 2013/09/25 12:26:46 ajacoutot Exp $
Fix build with gtk+3 >= 3.10.0
--- CMakeLists.txt.orig Mon Jun 24 21:22:42 2013
+++ CMakeLists.txt Wed Sep 25 14:01:17 2013
@@ -38,7 +38,7 @@ ADD_DEFINITIONS (-DBUILDTYPE=\\\"${CMAKE_BUILD_TYPE}\\
IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED")
+ SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations -DGDK_DISABLE_DEPRECATED")
ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
@@ -53,7 +53,7 @@ INSTALL (TARGETS sakura RUNTIME DESTINATION bin)
INSTALL (FILES sakura.desktop DESTINATION share/applications)
INSTALL (FILES terminal-tango.svg DESTINATION share/pixmaps)