Hello community, here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at Mon May 23 10:48:23 CEST 2011.
-------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/icedtea-web/icedtea-web.changes 2011-04-12 14:12:52.000000000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Tue Apr 12 12:12:11 UTC 2011 - [email protected] + +- Initial SUSE packaging of 1.0.2 + * just follow upstream's split of web tools to icedtea-web + calling whatdependson for head-i586 New: ---- icedtea-web-1.0.2-no-return-in-nonvoid-function.patch icedtea-web-1.0.2.tar.gz icedtea-web-suse-desktop-files.patch icedtea-web.changes icedtea-web.spec icedtea6-1.9.4-moonlight-symbol-clash.patch icedtea6-1.9.4-realpath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ # # spec file for package icedtea-web # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # this is the right version openjdk for us! %define openjdk_ver 1.6.0.0_b22.1.10.1 # for openSUSE 11.1 we need use update repo as it were not # released with this version %define xulrunner_ver 191 %if 0%{?suse_version} > 1130 %define xulrunner_ver 20 %endif %if 0%{?suse_version} == 1130 %define xulrunner_ver 192 %endif %ifarch %{ix86} %define archinstall i386 %endif %ifarch x86_64 %define archinstall amd64 %endif %define priority 17106 %define javaver 1.6.0 # use a same name of alternatives as Sun/IBM Java %define javaplugin javaplugin %define pluginsdir %{_libdir}/browser-plugins %define jredir jre-%{javaver}-openjdk %define sdkdir java-%{javaver}-openjdk %define pluginpath %{_jvmdir}/%{jredir}/lib/%{archinstall} %define pluginname IcedTeaPlugin.so Name: icedtea-web Version: 1.0.2 Release: 1 Summary: Java Web Start and plugin implementation Group: Development/Languages/Java License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception Url: http://icedtea.classpath.org Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz #PATCH-FIX-UPSTREAM: bnc#635365 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=613 Patch0: icedtea6-1.9.4-realpath.patch #PATCH-FIX-UPSTREAM: # https://bugzilla.mozilla.org/show_bug.cgi?id=582130 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622 Patch1: icedtea6-1.9.4-moonlight-symbol-clash.patch Patch2: icedtea-web-1.0.2-no-return-in-nonvoid-function.patch Patch1000: icedtea-web-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: java-1_6_0-openjdk-devel BuildRequires: pkgconfig >= 0.9.0 # IcedTeaPlugin build requirements. BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel %if %defined suse_version BuildRequires: fdupes BuildRequires: procps BuildRequires: gcc-c++ BuildRequires: update-desktop-files BuildRequires: zip %endif # to make sure the new package is installed in time of %post Requires(post): java-1_6_0-openjdk >= %{openjdk_ver} # Post requires alternatives to install tool alternatives. Requires(post): update-alternatives # Postun requires alternatives to uninstall tool alternatives. Requires(postun): update-alternatives # there were nothing like 1.9.8 in openSUSE Provides: java-1_6_0-openjdk-plugin = %{openjdk_ver} Obsoletes: java-1_6_0-openjdk-plugin < %{openjdk_ver} Provides: java-1.6.0-openjdk-plugin = %{openjdk_ver} Provides: java-plugin = %{javaver} %description The IcedTea-Web project provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project. %package javadoc Summary: API documentation for %{name} Group: Documentation/Other BuildArch: noarch %description javadoc This package contains Javadocs for the %{name}. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch1000 -p1 %build %{configure} \ --with-jdk-home=%{_jvmdir}/%{sdkdir} \ --prefix=%{_jvmdir}/%{jredir} \ --docdir=%{_javadocdir}/%{name} \ --with-pkgversion=suse-%{release}-%{_arch} make %install %{makeinstall} # Remove pluginappletviewer ... it is unused and will be removed in 1.1 rm -f %{buildroot}/%{jredir}/bin/pluginappletviewer #it's accidentally installed as file(!) /use/bin - but when it will disappear soon ... rm -f %{buildroot}/usr/bin # Install desktop files. install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps for d in javaws itweb-settings; do install -m 0644 $d.desktop %{buildroot}/%{_datadir}/applications/ %suse_update_desktop_file $d done # needs for sle-11-sp1 and openSUSE evergreen export NO_BRP_CHECK_BYTECODE_VERSION=true %clean rm -rf %{buildroot} %posttrans # java-1_6_0-openjdk-plugin -> icedtea-web is remove of the first package # which causes a javaplugin removal, so let's move it to %posttrans /usr/sbin/update-alternatives \ --install %{pluginsdir}/javaplugin.so %{javaplugin} \ %{pluginpath}/%{pluginname} %{priority} \ --slave %{_bindir}/javaws javaws %{_jvmdir}/%{jredir}/bin/javaws \ --slave %{_mandir}/man1/javaws.1 javaws.1 \ %{_jvmdir}/%{jredir}/man/man1/javaws.1 %postun if [ $1 -eq 0 ] then update-alternatives --remove %{javaplugin} \ %{pluginpath}/%{pluginname} fi %files %defattr(-,root,root,-) %doc NEWS README COPYING %{_jvmdir}/%{jredir}/bin/* %{_jvmdir}/%{jredir}/lib/* %{_jvmdir}/%{jredir}/man/man1/* %dir %{_jvmdir}/%{jredir}/man/ %dir %{_jvmdir}/%{jredir}/man/man1/ %{_datadir}/pixmaps/javaws.png %{_datadir}/applications/*desktop %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog ++++++ icedtea-web-1.0.2-no-return-in-nonvoid-function.patch ++++++ Index: icedtea-web-1.0.2/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc =================================================================== --- icedtea-web-1.0.2.orig/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2011-04-02 23:52:41.000000000 +0200 +++ icedtea-web-1.0.2/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2011-04-06 14:17:44.458931121 +0200 @@ -816,6 +816,7 @@ } pthread_cleanup_pop(1); + return NULL; } /****************************************** ++++++ icedtea-web-suse-desktop-files.patch ++++++ Index: icedtea-web-1.0.2/itweb-settings.desktop.in =================================================================== --- icedtea-web-1.0.2.orig/itweb-settings.desktop.in 2011-04-02 23:52:41.000000000 +0200 +++ icedtea-web-1.0.2/itweb-settings.desktop.in 2011-04-05 16:00:05.579938163 +0200 @@ -1,8 +1,9 @@ [Desktop Entry] Name=IcedTea Web Control Panel +GenericName=IcedTea Web Control Panel Comment=Configure IcedTea Web (javaws and plugin) Exec=PATH_TO_ITWEB_SETTINGS Icon=javaws Terminal=false Type=Application -Categories=Settings; +Categories=System;Network ++++++ icedtea6-1.9.4-moonlight-symbol-clash.patch ++++++ Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.cc =================================================================== --- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaNPPlugin.cc 2011-01-31 10:08:56.000000000 +0100 +++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.cc 2011-01-31 10:11:29.603519684 +0100 @@ -234,7 +234,7 @@ static GPid appletviewer_pid = -1; static guint appletviewer_watch_id = -1; -int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL; +int icedtea_plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL; pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER; @@ -1534,7 +1534,7 @@ gchar** command_line; gchar** environment; - if (plugin_debug) + if (icedtea_plugin_debug) { command_line = (gchar**) malloc(sizeof(gchar*)*8); command_line[0] = g_strdup(appletviewer_executable); @@ -1580,7 +1580,7 @@ g_free (command_line[1]); command_line[1] = NULL; - if (plugin_debug) + if (icedtea_plugin_debug) { g_free (command_line[2]); command_line[2] = NULL; Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.h =================================================================== --- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaNPPlugin.h 2010-12-01 20:08:14.000000000 +0100 +++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.h 2011-01-31 10:11:29.595520091 +0100 @@ -96,7 +96,7 @@ extern pthread_cond_t cond_message_available; // debug switch -extern int plugin_debug; +extern int icedtea_plugin_debug; // Browser function table. extern NPNetscapeFuncs browser_functions; Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.cc =================================================================== --- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaPluginUtils.cc 2010-12-01 20:08:15.000000000 +0100 +++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.cc 2011-01-31 10:11:29.595520091 +0100 @@ -401,7 +401,7 @@ wchar_t c; - if (plugin_debug) printf("Converted UTF-16LE string: "); + if (icedtea_plugin_debug) printf("Converted UTF-16LE string: "); result_unicode_str->clear(); for (int i = begin; i < begin+length; i+=2) @@ -415,14 +415,14 @@ (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')) { - if (plugin_debug) printf("%c", c); + if (icedtea_plugin_debug) printf("%c", c); } result_unicode_str->push_back(c); } // not routing via debug print macros due to wide-string issues - if (plugin_debug) printf(". Length=%d\n", result_unicode_str->length()); + if (icedtea_plugin_debug) printf(". Length=%d\n", result_unicode_str->length()); } /* @@ -436,7 +436,7 @@ { // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) + if (!icedtea_plugin_debug) return; std::string* str = new std::string(); @@ -612,7 +612,7 @@ IcedTeaPluginUtilities::printStringPtrVector(const char* prefix, std::vector<std::string*>* str_ptr_vector) { // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) + if (!icedtea_plugin_debug) return; std::string* str = new std::string(); @@ -636,7 +636,7 @@ IcedTeaPluginUtilities::printNPVariant(NPVariant variant) { // This is a CPU intensive function. Run only if debugging - if (!plugin_debug) + if (!icedtea_plugin_debug) return; if (NPVARIANT_IS_VOID(variant)) Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.h =================================================================== --- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaPluginUtils.h 2010-12-01 20:08:15.000000000 +0100 +++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaPluginUtils.h 2011-01-31 10:11:29.599519887 +0100 @@ -69,7 +69,7 @@ #define PLUGIN_DEBUG(...) \ do \ { \ - if (plugin_debug) \ + if (icedtea_plugin_debug) \ { \ fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \ fprintf (stderr, __VA_ARGS__); \ ++++++ icedtea6-1.9.4-realpath.patch ++++++ Index: icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.cc =================================================================== --- icedtea6-1.9.4.orig/plugin/icedteanp/IcedTeaNPPlugin.cc 2011-01-17 13:53:33.663627966 +0100 +++ icedtea6-1.9.4/plugin/icedteanp/IcedTeaNPPlugin.cc 2011-01-17 14:17:53.860000617 +0100 @@ -2076,6 +2076,7 @@ } NPError np_error = NPERR_NO_ERROR; gchar* filename = NULL; + gchar* rfilename = NULL; // If P_tmpdir does not exist, try /tmp directly @@ -2142,12 +2143,7 @@ np_error = NPERR_GENERIC_ERROR; goto cleanup_data_directory; } - filename = (gchar*) malloc(sizeof(gchar)*1024); - filename_size = readlink(info.dli_fname, filename, 1023); - if (filename_size >= 0) - { - filename[filename_size] = '\0'; - } + filename = (gchar*) malloc(sizeof(gchar)*PATH_MAX); if (!filename) { @@ -2155,12 +2151,14 @@ np_error = NPERR_OUT_OF_MEMORY_ERROR; goto cleanup_data_directory; } - - if (filename_size <= 0) + + rfilename = realpath(info.dli_fname, filename); + if (!rfilename) { free(filename); filename = g_strdup(info.dli_fname); } + PLUGIN_DEBUG("realpath(\"%s\") == \"%s\"\n", info.dli_fname, filename); appletviewer_executable = g_strdup_printf ("%s/../../bin/java", dirname (filename)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
