Mailinglist Archive: opensuse-commit (1929 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package icedtea-web for openSUSE:Factory
checked in at Tue Oct 11 16:55:00 CEST 2011.



--------
--- openSUSE:Factory/icedtea-web/icedtea-web.changes    2011-09-23 
02:03:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/icedtea-web/icedtea-web.changes        
2011-10-10 13:30:30.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Oct 10 11:19:41 UTC 2011 - gber@xxxxxxxxxxxx
+
+- fix icedtea-web-suse-desktop-files.patch, itweb-settings is a
+  desktop setting and should not show up twice in two unrelated
+  top-level menus; also add a trailing semicolon
+
+-------------------------------------------------------------------
+Thu Sep 15 08:33:59 UTC 2011 - mvyskocil@xxxxxxx
+
+- Build with a npapi-sdk and xulrunner-devel from openSUSE 12.1
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  icedtea-web-1.1.2-npapi-sdk.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ icedtea-web.spec ++++++
--- /var/tmp/diff_new_pack.5UpHrq/_old  2011-10-11 16:54:49.000000000 +0200
+++ /var/tmp/diff_new_pack.5UpHrq/_new  2011-10-11 16:54:49.000000000 +0200
@@ -29,6 +29,11 @@
 %define xulrunner_ver 192
 %endif
 
+%define with_npapisdk 0
+%if 0%{?suse_version} > 1140
+%define with_npapisdk 1
+%endif
+
 %ifarch %{ix86}
 %define archinstall i386
 %endif
@@ -60,6 +65,8 @@
 # https://bugzilla.mozilla.org/show_bug.cgi?id=582130
 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622
 Patch1:         icedtea-web-1.1-moonlight-symbol-clash.patch
+# Deprecation of xulrunner-devel
+Patch2:         icedtea-web-1.1.2-npapi-sdk.patch
 Patch1000:      icedtea-web-suse-desktop-files.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  java-1_6_0-openjdk-devel
@@ -68,8 +75,15 @@
 # IcedTeaPlugin build requirements.
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
+%if %{with_npapisdk}
+BuildRequires:  pkgconfig(npapi-sdk)
+#FIXME: use after deprecation of mozilla-xulrunner* packages from Factory
+#BuildRequires:  pkgconfig(libxul)
+BuildRequires:  xulrunner-devel
+%else
 BuildRequires:  mozilla-nspr-devel
 BuildRequires:  mozilla-xulrunner%{xulrunner_ver}-devel
+%endif
 %if %defined suse_version
 BuildRequires:  fdupes
 BuildRequires:  procps
@@ -97,7 +111,6 @@
 Web Start, originally based on the NetX project.
 %package javadoc
 
-
 Summary:        API documentation for %{name}
 Group:          Documentation/Other
 %if 0%{?suse_version} >= 1120
@@ -111,10 +124,16 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%if %{with_npapisdk}
+%patch2 -p1
+%endif
 
 %patch1000 -p1
 
 %build
+%if %{with_npapisdk}
+autoreconf -f
+%endif
 %{configure} \
     --with-jdk-home=%{_jvmdir}/%{sdkdir} \
     --with-jre-home=%{_jvmdir}/jre/ \

++++++ icedtea-web-1.1.2-npapi-sdk.patch ++++++
Index: icedtea-web-1.1.2/acinclude.m4
===================================================================
--- icedtea-web-1.1.2.orig/acinclude.m4 2011-08-31 19:28:19.000000000 +0200
+++ icedtea-web-1.1.2/acinclude.m4      2011-09-15 10:06:23.294063494 +0200
@@ -372,7 +372,7 @@
   AC_SUBST(GTK_CFLAGS)
   AC_SUBST(GTK_LIBS)
 
-  PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
+  PKG_CHECK_MODULES(MOZILLA, npapi-sdk)
     
   AC_SUBST(MOZILLA_CFLAGS)
   AC_SUBST(MOZILLA_LIBS)
Index: icedtea-web-1.1.2/plugin/icedteanp/IcedTeaNPPlugin.cc
===================================================================
--- icedtea-web-1.1.2.orig/plugin/icedteanp/IcedTeaNPPlugin.cc  2011-09-15 
10:05:02.000000000 +0200
+++ icedtea-web-1.1.2/plugin/icedteanp/IcedTeaNPPlugin.cc       2011-09-15 
10:20:06.504516192 +0200
@@ -2262,7 +2262,7 @@
 
 // Returns a string describing the MIME type that this plugin
 // handles.
-char*
+const char*
 NP_GetMIMEDescription ()
 {
   PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
++++++ icedtea-web-suse-desktop-files.patch ++++++
--- /var/tmp/diff_new_pack.5UpHrq/_old  2011-10-11 16:54:49.000000000 +0200
+++ /var/tmp/diff_new_pack.5UpHrq/_new  2011-10-11 16:54:49.000000000 +0200
@@ -12,4 +12,4 @@
  Terminal=false
  Type=Application
 -Categories=Settings;
-+Categories=System;Network
++Categories=Settings;DesktopSettings;

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx