[mingw-gtkhtml3] Update to 4.4.0
Erik van Pienbroek
epienbro at fedoraproject.org
Sun Apr 8 13:24:03 UTC 2012
commit 96b5d1937b74031b4c6131b62f2b41932cac149e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Apr 8 15:23:45 2012 +0200
Update to 4.4.0
- Update to 4.4.0
- Link against gtk3
- Dropped upstreamed GConf patch
- Dropped upstreamed g_thread_init patch
gtkhtml-make-gconf-optional.patch | 222 ---------------------------------
gtkhtml-make-iso-codes-optional.patch | 12 +-
gtkhtml_enable_static_build.patch | 2 +-
mingw-gtkhtml3.spec | 64 +++++-----
4 files changed, 37 insertions(+), 263 deletions(-)
---
diff --git a/gtkhtml-make-iso-codes-optional.patch b/gtkhtml-make-iso-codes-optional.patch
index 984a137..07e9d76 100644
--- a/gtkhtml-make-iso-codes-optional.patch
+++ b/gtkhtml-make-iso-codes-optional.patch
@@ -1,11 +1,11 @@
--- a/configure.ac.orig 2010-05-08 18:13:14.000000000 +0200
+++ b/configure.ac 2010-05-08 18:14:05.606880865 +0200
-@@ -174,7 +174,7 @@
+@@ -141,7 +141,7 @@
dnl **********************************
dnl GTKHTML modules
dnl **********************************
--GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version iso-codes"
-+GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version"
- PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
- if test "$have_gconf" = "true" ; then
- GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
+-GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version"
++GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant >= enchant_minimum_version gsettings-desktop-schemas cairo >= cairo_minimum_version"
+ PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
+ AC_SUBST(GTKHTML_CFLAGS)
+ AC_SUBST(GTKHTML_LIBS)
diff --git a/gtkhtml_enable_static_build.patch b/gtkhtml_enable_static_build.patch
index d0b3b5e..84aa303 100644
--- a/gtkhtml_enable_static_build.patch
+++ b/gtkhtml_enable_static_build.patch
@@ -10,7 +10,7 @@
BOOL WINAPI DllMain (HINSTANCE hinstDLL,
DWORD fdwReason,
@@ -103,6 +105,8 @@
- return TRUE;
+ return TRUE;
}
+#endif
diff --git a/mingw-gtkhtml3.spec b/mingw-gtkhtml3.spec
index db51324..c68ad3d 100644
--- a/mingw-gtkhtml3.spec
+++ b/mingw-gtkhtml3.spec
@@ -2,23 +2,18 @@
%global __objdump %{mingw32_objdump}
%define __debug_install_post %{mingw32_debug_install_post}
+# first two digits of version
+%global release_version %(echo %{version} | awk -F. '{print $1"."$2}')
+
Name: mingw-gtkhtml3
-Version: 3.32.2
-Release: 7%{?dist}
+Version: 4.4.0
+Release: 1%{?dist}
Summary: MinGW library for embedding a lightweight web browser in GTK programs
License: LGPLv2+
Group: Development/Libraries
URL: http://projects.gnome.org/evolution/
-Source: http://download.gnome.org/sources/gtkhtml/3.32/gtkhtml-%{version}.tar.bz2
-
-# GConf doesn't work well on Win32 and it's only used by GtkHTML
-# to figure out font-related settings like antialiasing. Even if
-# we enable GConf support it doesn't make any sense as Windows maintains
-# such settings in the Win32 registry and there isn't a relation between
-# the GConf registry and the Win32 registry. This patch makes the
-# GConf dependency optional and makes GtkHTML use the default font settings
-Patch0: gtkhtml-make-gconf-optional.patch
+Source: http://download.gnome.org/sources/gtkhtml/%{release_version}/gtkhtml-%{version}.tar.xz
# The configure script searches for the presence of the pkgconfig file for
# gnome-icon-theme which we don't have for Fedora-MinGW (as it only contains
@@ -29,23 +24,23 @@ Patch1: gtkhtml-dont-search-for-gnome-icon-theme.patch
# The same situation as with Patch1 also applies to the iso-codes dependency
Patch2: gtkhtml-make-iso-codes-optional.patch
+# Strip out the gsettings-desktop-schemas dependency
+Patch3: gtkhtml-make-gsettings-desktop-schemas-optional.patch
+
# Normally GtkHTML always exports a function named 'DllMain' on
# Win32 environments. When GtkHTML is built as a static library, this
# function doesn't serve any purpose and it can introduce potential
# conflicts with other static libraries which may export a 'DllMain' function
# This patch causes the DllMain function to be ignore when GtkHTML is
# being built as a static library
-Patch3: gtkhtml_enable_static_build.patch
-
-# The GLib function g_thread_init isn't available anymore as of GLib 2.32
-Patch4: gtkhtml-dont-use-g-thread-init.patch
+Patch4: gtkhtml_enable_static_build.patch
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 68
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
-BuildRequires: mingw32-gtk2
+BuildRequires: mingw32-gtk3
BuildRequires: mingw32-libgnurx
BuildRequires: mingw32-libsoup
BuildRequires: mingw32-enchant
@@ -85,10 +80,9 @@ Static version of the MinGW Windows GtkHTML library.
%prep
%setup -q -n gtkhtml-%{version}
-%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p0
+%patch3 -p1
%patch4 -p0
libtoolize --copy --force
@@ -120,10 +114,6 @@ make -C build_shared DESTDIR=$RPM_BUILD_ROOT install
make -C build_static DESTDIR=$RPM_BUILD_ROOT/build_static install
mv $RPM_BUILD_ROOT/build_static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir}
-# Manually merge the libtool files
-sed -i s/"old_library=''"/"old_library='libgtkhtml-3.14.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgtkhtml-3.14.la
-sed -i s/"old_library=''"/"old_library='libgtkhtml-editor-3.14.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgtkhtml-editor-3.14.la
-
# Drop the folder which was temporary used for installing the static bits
rm -rf $RPM_BUILD_ROOT/build_static
@@ -133,28 +123,34 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
# Install a small test program
install -m0755 build_shared/gtkhtml/.libs/testgtkhtml.exe $RPM_BUILD_ROOT%{mingw32_bindir}/testgtkhtml.exe
-%find_lang gtkhtml-3.14
+%find_lang gtkhtml-4.0
-%files -n mingw32-gtkhtml3 -f gtkhtml-3.14.lang
+%files -n mingw32-gtkhtml3 -f gtkhtml-4.0.lang
%doc COPYING.LIB
%{mingw32_bindir}/gtkhtml-editor-test.exe
-%{mingw32_bindir}/libgtkhtml-3.14-19.dll
-%{mingw32_bindir}/libgtkhtml-editor-3.14-0.dll
+%{mingw32_bindir}/libgtkhtml-4.0-0.dll
+%{mingw32_bindir}/libgtkhtml-editor-4.0-0.dll
%{mingw32_bindir}/testgtkhtml.exe
-%{mingw32_includedir}/libgtkhtml-3.14
-%{mingw32_libdir}/libgtkhtml-3.14.dll.a
-%{mingw32_libdir}/libgtkhtml-editor-3.14.dll.a
-%{mingw32_libdir}/pkgconfig/libgtkhtml-3.14.pc
-%{mingw32_libdir}/pkgconfig/gtkhtml-editor-3.14.pc
-%{mingw32_datadir}/gtkhtml-3.14
+%{mingw32_includedir}/libgtkhtml-4.0
+%{mingw32_libdir}/libgtkhtml-4.0.dll.a
+%{mingw32_libdir}/libgtkhtml-editor-4.0.dll.a
+%{mingw32_libdir}/pkgconfig/libgtkhtml-4.0.pc
+%{mingw32_libdir}/pkgconfig/gtkhtml-editor-4.0.pc
+%{mingw32_datadir}/gtkhtml-4.0
%files -n mingw32-gtkhtml3-static
-%{mingw32_libdir}/libgtkhtml-3.14.a
-%{mingw32_libdir}/libgtkhtml-editor-3.14.a
+%{mingw32_libdir}/libgtkhtml-4.0.a
+%{mingw32_libdir}/libgtkhtml-editor-4.0.a
%changelog
+* Sun Apr 8 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.4.0-1
+- Update to 4.4.0
+- Link against gtk3
+- Dropped upstreamed GConf patch
+- Dropped upstreamed g_thread_init patch
+
* Fri Mar 09 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.32.2-7
- Don't use g_thread_init anymore
More information about the scm-commits
mailing list