Accepting request 246144 from GNOME:Next

- Add anjuta-devhelp-webkit2.patch: Detect if devhelp was built
  against webkit2gtk-4.0.
- Add gnome-common BuildRequires and call to autogen.sh, as above
  patch touches the build system.

OBS-URL: https://build.opensuse.org/request/show/246144
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=176
This commit is contained in:
Dominique Leuenberger 2014-08-25 06:56:56 +00:00 committed by Git OBS Bridge
parent 296843d676
commit dd4993e076
3 changed files with 40 additions and 0 deletions

View File

@ -0,0 +1,25 @@
From f65b982f803cbc7508afb70737618bd07b3567ec Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sun, 24 Aug 2014 16:09:57 +0200
Subject: [PATCH] devhelp plugin: support webkit2gtk-3.0 and webkit2gtk-4.0
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 619f126..09138df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,7 +234,7 @@ fi
if test "x$devhelp_enabled" = "xyes"; then
case "$PLUGIN_DEVHELP_LIBS" in
- *webkit2gtk-3.0*)
+ *webkit2gtk-3.0*|*webkit2gtk-4.0*)
AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
;;
esac
--
2.0.4

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Aug 24 14:29:58 UTC 2014 - dimstar@opensuse.org
- Add anjuta-devhelp-webkit2.patch: Detect if devhelp was built
against webkit2gtk-4.0.
- Add gnome-common BuildRequires and call to autogen.sh, as above
patch touches the build system.
-------------------------------------------------------------------
Sat Aug 23 15:07:02 UTC 2014 - dimstar@opensuse.org

View File

@ -25,12 +25,16 @@ Group: Development/Tools/IDE
Url: http://anjuta.sourceforge.net/
Source0: http://download.gnome.org/sources/anjuta/3.13/%{name}-%{version}.tar.xz
Source99: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM anjuta-devhelp-webkit2.patch bgo#735328 dimstar@opensuse.org -- devhelp can be build either with WebKit2gtk-3.0 or WebKit2gtk-4.0
Patch0: anjuta-devhelp-webkit2.patch
BuildRequires: autogen
BuildRequires: binutils-devel
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gcc-c++
# Needed for patch0
BuildRequires: gnome-common
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
BuildRequires: libapr-util1-devel
@ -149,9 +153,12 @@ and more.
%lang_package
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build
# Needed for patch0
NOCONFIGURE=1 ./autogen.sh
%configure\
--disable-static \
--enable-glade-catalog