rpms/devhelp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Incorporate some upstream fixes

Browse Source
This commit is contained in:
Matthias Clasen 2010-08-23 12:00:42 -04:00
parent 135b2e3c4e
commit d912604c30
3 changed files with 75 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-pkgconfig-Require-webkitgtk-3.0-instead-of-webkit-3..patch Normal file
View File

@ -0,0 +1,27 @@
From 941342f37471320eae9e8e851de2d7a54d283a90 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalev@smartlink.ee>
Date: Sun, 22 Aug 2010 16:29:01 +0300
Subject: [PATCH 1/2] pkgconfig: Require webkitgtk-3.0 instead of webkit-3.0
The GTK+ 3 version of WebKit installs webkitgtk-3.0.pc, whereas the
GTK+ 2 version used to install webkit-1.0.pc.
---
data/libdevhelp-3.0.pc.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/data/libdevhelp-3.0.pc.in b/data/libdevhelp-3.0.pc.in
index e63e80b..b3db9f8 100644
--- a/data/libdevhelp-3.0.pc.in
+++ b/data/libdevhelp-3.0.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
Name: devhelp
Description: devhelp
-Requires: gtk+-3.0 webkit-3.0
+Requires: gtk+-3.0 webkitgtk-3.0
Requires.private: @REQUIRES_LIBWNCK@
Version: @VERSION@
Libs: -L${libdir} -ldevhelp-3
--
1.7.2.1

39
0002-Use-double-quotes-for-including-dh-headers.patch Normal file
View File

@ -0,0 +1,39 @@
From 95e1bd08872047930d5c89a63affe506f8a0f1f0 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalev@smartlink.ee>
Date: Sun, 22 Aug 2010 17:08:29 +0300
Subject: [PATCH 2/2] Use double quotes for including dh- headers
---
src/dh-base.h | 2 +-
src/dh-book-manager.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/dh-base.h b/src/dh-base.h
index 6971652..56f2605 100644
--- a/src/dh-base.h
+++ b/src/dh-base.h
@@ -25,7 +25,7 @@
#include <gtk/gtk.h>
-#include <dh-book-manager.h>
+#include "dh-book-manager.h"
G_BEGIN_DECLS
diff --git a/src/dh-book-manager.h b/src/dh-book-manager.h
index 4fd3b3f..3fec290 100644
--- a/src/dh-book-manager.h
+++ b/src/dh-book-manager.h
@@ -23,7 +23,7 @@
#include <gtk/gtk.h>
-#include <dh-book.h>
+#include "dh-book.h"
G_BEGIN_DECLS
--
1.7.2.1

12
devhelp.spec
View File

@ -6,7 +6,7 @@
Name: devhelp
Version: 2.90.5
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
Group: Development/Tools
Summary: API documention browser
@ -14,9 +14,10 @@ URL: http://developer.imendio.com/projects/devhelp
#VCS: git:git://git.gnome.org/devhelp
Source: http://download.gnome.org/sources/devhelp/2.90/devhelp-%{version}.tar.bz2
# upstream fix
# upstream fixes
Patch0: devhelp-gtk3.patch
Patch1: 0001-pkgconfig-Require-webkitgtk-3.0-instead-of-webkit-3..patch
Patch2: 0002-Use-double-quotes-for-including-dh-headers.patch
### Dependencies ###
Requires(pre): GConf2 >= 2.14
@ -53,6 +54,8 @@ into other applications such as IDEs.
%prep
%setup -q -n devhelp-%{version}
%patch0 -p1 -b .gtk3
%patch1 -p1 -b .pkgconfig
%patch2 -p1 -b .double-quotes
# force regeneration
rm data/devhelp.schemas
@ -140,6 +143,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%{_libdir}/pkgconfig/*
%changelog
* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> - 2.90.5-3
- Incorporate a few upstream fixes
* Wed Jul 14 2010 Matthias Clasen <mclasen@redhat.com> - 2.90.5-2
- Fix platform check to work with GTK3