pool/devhelp
SHA256
17
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 97462 from home:vuntz:branches:GNOME:Factory

Browse Source 
Update to 3.3.3

OBS-URL: https://build.opensuse.org/request/show/97462
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/devhelp?expand=0&rev=59
This commit is contained in:
Vincent Untz
2011-12-21 04:59:12 +00:00
committed by Git OBS Bridge
parent 2e29943187
commit 3ca57e2d4f
5 changed files with 33 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
devhelp-3.2.0.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1341d1060c094956e8496c9ed68334192ca963fa211489737a0b84a4693c232d
size 592356

3
devhelp-3.3.3.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:58d0482d63fec858b044c92c7af2367c275fa4d834bdf157a0ba0d249353461d
size 488724

66
devhelp-fix-multiple-gdk-backends.patch
View File

@@ -1,66 +0,0 @@
commit ca19a061bbf5e4b33119af81ff66b39e9b175b9b
Author: Vincent Untz <vuntz@gnome.org>
Date: Mon Jul 4 14:39:22 2011 +0200
build: Fix detection of GDK backend in case of multiple backends
The GDK backend detection routine only worked in the case where GTK+ is
built for one and only one backend.
https://bugzilla.gnome.org/show_bug.cgi?id=652999
diff --git a/acinclude.m4 b/acinclude.m4
index 56aa3a2..cc47f19 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,24 +1,32 @@
AC_DEFUN([IGE_PLATFORM_CHECK],[
- gdk_target=`$PKG_CONFIG --variable=targets gtk+-3.0`
+ gdk_targets=`$PKG_CONFIG --variable=targets gtk+-3.0`
- if test "x$gdk_target" = "xquartz"; then
- AC_MSG_CHECKING([checking for Mac OS X support])
- carbon_ok=no
- AC_TRY_CPP([
- #include <Carbon/Carbon.h>
- #include <CoreServices/CoreServices.h>
- ], carbon_ok=yes)
- AC_MSG_RESULT($carbon_ok)
- if test $carbon_ok = yes; then
- IGE_PLATFORM=osx
- IGE_PLATFORM_NAME="GTK+ OS X"
- AC_DEFINE(HAVE_PLATFORM_OSX, 1, [whether GTK+ OS X is available])
+ IGE_PLATFORM=
+
+ for gdk_target in $gdk_targets; do
+ if test "x$gdk_target" = "xquartz"; then
+ AC_MSG_CHECKING([checking for Mac OS X support])
+ carbon_ok=no
+ AC_TRY_CPP([
+ #include <Carbon/Carbon.h>
+ #include <CoreServices/CoreServices.h>
+ ], carbon_ok=yes)
+ AC_MSG_RESULT($carbon_ok)
+ if test $carbon_ok = yes; then
+ IGE_PLATFORM=osx
+ IGE_PLATFORM_NAME="GTK+ OS X"
+ AC_DEFINE(HAVE_PLATFORM_OSX, 1, [whether GTK+ OS X is available])
+ break
+ fi
+ elif test "x$gdk_target" = "xx11"; then
+ IGE_PLATFORM=x11
+ IGE_PLATFORM_NAME="GTK+ X11"
+ AC_DEFINE(HAVE_PLATFORM_X11, 1, [whether GTK+ X11 is available])
+ break
fi
- elif test "x$gdk_target" = "xx11"; then
- IGE_PLATFORM=x11
- IGE_PLATFORM_NAME="GTK+ X11"
- AC_DEFINE(HAVE_PLATFORM_X11, 1, [whether GTK+ X11 is available])
- else
+ done
+
+ if test "x$IGE_PLATFORM" = "x"; then
AC_MSG_ERROR([Could not detect the platform])
fi

18
devhelp.changes
View File

@@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Dec 20 10:00:34 UTC 2011 - vuntz@opensuse.org
- Update to version 3.3.3:
+ Bugs fixed:
- bgo#456282: Add globbing/wildcards to search fields
- bgo#646398, bgo#649064, bgo#652999, bgo#663789, bgo#666446.
+ Updated translations.
- Add xz BuildRequires because we can't build a package for a
xz-compressed tarball without explicitly specifying that... See
bnc#697467 for more details.
- Remove libwnck-devel BuildRequires: removed upstream.
- Drop devhelp-fix-multiple-gdk-backends.patch: fixed upstream.
Also remove gnome-common BuildRequires and call to
gnome-autogen.sh that were needed for the patch.
- Update descriptions of packages.
- Update Url tag.
-------------------------------------------------------------------
Mon Sep 26 19:44:42 UTC 2011 - vuntz@opensuse.org

67
devhelp.spec
View File

@@ -19,28 +19,25 @@
%define vimplugin_dir %{_datadir}/vim/site
Name: devhelp
Version: 3.2.0
Release: 1
License: GPLv2+
Version: 3.3.3
Release: 0
Summary: Developer's Help Program for GNOME
Url: http://developer.imendio.com/wiki/Devhelp
License: GPL-2.0+
Group: Development/Tools/Other
Source: http://download.gnome.org/sources/devhelp/3.2/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM devhelp-fix-multiple-gdk-backends.patch bgo#652999 vuntz@opensuse.org -- Fix build when GTK+ has more than one backend (x11 & broadway, for instance)
Patch0: devhelp-fix-multiple-gdk-backends.patch
Url: https://live.gnome.org/devhelp
Source: http://download.gnome.org/sources/devhelp/3.3/%{name}-%{version}.tar.xz
BuildRequires: fdupes
BuildRequires: gconf2-devel
# Needed for patch0
BuildRequires: gnome-common
# For directory ownership of the plugins:
BuildRequires: gedit
BuildRequires: gtk3-devel
BuildRequires: intltool
BuildRequires: pkgconfig(webkitgtk-3.0)
BuildRequires: libwnck-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: vim
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
BuildRequires: xz
BuildRequires: pkgconfig(webkitgtk-3.0)
Recommends: %{name}-lang
Suggests: gedit-plugin-devhelp
Suggests: vim-plugin-devhelp
@@ -48,75 +45,35 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
%description
Devhelp Features - Full indexing of books in XML
- HTML viewer (GtkHTML2)
- Search by function, struct, macro, and more
- Auto completion
- Command line search with nice Emacs integration
Devhelp is an API documentation browser for GTK+ and GNOME.
%package devel
License: GPLv2+
Summary: Developer's Help Program For GNOME
Group: Development/Tools/Other
Requires: %{name} = %{version}
%description devel
Devhelp Features - Full indexing of books in XML.
- HTML viewer (GtkHTML2).
- Search by function, struct, macro, and more.
- Auto completion.
- Commandline search, with nice emacs integration.
Devhelp is an API documentation browser for GTK+ and GNOME.
%package -n gedit-plugin-devhelp
License: GPLv2+
Summary: Developer's Help Program for GNOME
Group: Development/Tools/Other
Requires: gedit
%description -n gedit-plugin-devhelp
Devhelp Features - Full indexing of books in XML
- HTML viewer (GtkHTML2)
- Search by function, struct, macro, and more
- Auto completion
- Command line search with nice Emacs integration
Devhelp is an API documentation browser for GTK+ and GNOME.
%package -n vim-plugin-devhelp
License: GPLv2+
Summary: Developer's Help Program for GNOME
Group: Development/Tools/Other
Requires: vim
%description -n vim-plugin-devhelp
Devhelp Features - Full indexing of books in XML
- HTML viewer (GtkHTML2)
- Search by function, struct, macro, and more
- Auto completion
- Command line search with nice Emacs integration
Devhelp is an API documentation browser for GTK+ and GNOME.
%lang_package
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%build
NOCONFIGURE=1 gnome-autogen.sh
%configure \
--disable-static
make %{?_smp_mflags} V=1