commit icedtea-web for openSUSE:Factory
Hello community, here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at 2014-05-06 13:57:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icedtea-web (Old) and /work/SRC/openSUSE:Factory/.icedtea-web.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icedtea-web" Changes: -------- --- /work/SRC/openSUSE:Factory/icedtea-web/icedtea-web.changes 2014-02-19 07:02:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icedtea-web.new/icedtea-web.changes 2014-05-06 13:57:09.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 5 09:58:04 UTC 2014 - fstrba@suse.com + +- Trying to modify some dependencies so that it builds on SLE11 +- Patches: + * add icedtea-web-1.4.2-gthread.patch to allow linking with + libgthread-2.0 + +------------------------------------------------------------------- New: ---- icedtea-web-1.4.2-gthread.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ --- /var/tmp/diff_new_pack.JpE1aw/_old 2014-05-06 13:57:10.000000000 +0200 +++ /var/tmp/diff_new_pack.JpE1aw/_new 2014-05-06 13:57:10.000000000 +0200 @@ -27,7 +27,7 @@ # for openSUSE 11.1 we need use update repo as it were not # released with this version -%define xulrunner_ver 191 +%define xulrunner_ver 192 %if 0%{?suse_version} >= 1140 %define xulrunner_ver 20 %endif @@ -72,6 +72,8 @@ Patch2: icedtea-web-1.4.2-mkdir.patch #PATCH-FIX-UPSTREAM: add -lX11 on the end of cc's command line Patch3: icedtea-web-1.4.2-softkiller-link.patch +#PATCH: add gthread that is needed to link on SLE11 +Patch4: icedtea-web-1.4.2-gthread.patch Patch1000: icedtea-web-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -92,7 +94,11 @@ %endif BuildRequires: fdupes BuildRequires: gcc-c++ +%if 0%{suse_version} > 1140 BuildRequires: libX11-devel +%else +BuildRequires: xorg-x11-devel +%endif BuildRequires: libtool BuildRequires: pkgconfig >= 0.9.0 BuildRequires: procps @@ -151,6 +157,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch1000 -p1 ++++++ icedtea-web-1.4.2-gthread.patch ++++++ --- icedtea-web-1.4.2/acinclude.m4 2014-02-04 10:11:22.733582815 +0100 +++ icedtea-web-1.4.2/acinclude.m4 2014-05-05 12:14:08.158722528 +0200 @@ -365,7 +365,7 @@ dnl FIXME: use unstable AC_REQUIRE([IT_CHECK_PLUGIN]) if test "x${enable_plugin}" = "xyes" ; then - PKG_CHECK_MODULES(GLIB, glib-2.0) + PKG_CHECK_MODULES(GLIB, glib-2.0 gthread-2.0) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de