February 2011 - openSUSE Commits - openSUSE Mailing Lists

commit kdelibs4 for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '11

01 Feb '11

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Tue Feb 1 18:42:21 CET 2011. -------- --- KDE/kdelibs4/kdelibs4-apidocs.changes 2011-01-14 14:52:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4-apidocs.changes 2011-01-19 23:14:01.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Jan 19 23:13:55 CET 2011 - dmueller(a)suse.de + +- update to 4.6.0 + * For highlights, see http://kde.org/announcements/4.6 + + +------------------------------------------------------------------- kdelibs4.changes: same change calling whatdependson for head-i586 Old: ---- kdelibs-4.5.95.tar.bz2 New: ---- kdelibs-4.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.vVyjSD/_old 2011-02-01 18:41:57.000000000 +0100 +++ /var/tmp/diff_new_pack.vVyjSD/_new 2011-02-01 18:41:57.000000000 +0100 @@ -25,8 +25,8 @@ Group: System/GUI/KDE Summary: KDE 4 API documentation Url: http://www.kde.org -Version: 4.5.95 -Release: 2 +Version: 4.6.0 +Release: 1 Requires: kde4-filesystem Source0: kdelibs-%version.tar.bz2 Source1: baselibs.conf ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.vVyjSD/_old 2011-02-01 18:41:57.000000000 +0100 +++ /var/tmp/diff_new_pack.vVyjSD/_new 2011-02-01 18:41:57.000000000 +0100 @@ -43,8 +43,8 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 4.5.95 -Release: 2 +Version: 4.6.0 +Release: 1 Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: kdelibs4-core = %version @@ -90,6 +90,10 @@ %if %suse_version > 1130 Requires: %{name}-branding = 11.4 %endif +%if 0%{?suse_version} > 1120 +Requires: udisks +Requires: upower +%endif %description This package contains the basic packages of the K Desktop Environment. @@ -328,10 +332,6 @@ Group: System/GUI/KDE Summary: KDE Base Libraries %requires_ge libqt4-x11 -%if 0%{?suse_version} > 1120 -Requires: udisks -Requires: upower -%endif %description -n libkde4 This package contains the basic packages of the K Desktop Environment. @@ -353,7 +353,7 @@ %files branding-upstream %defattr(-,root,root) %doc COPYING.LIB -%_kde4_appsdir/kdeui/about/body-background.png +%_kde4_appsdir/kdeui/about/body-background.jpg %files -n libkde4 %defattr(-,root,root) @@ -449,7 +449,7 @@ %exclude %_kde4_bindir/kde4-doxygen.sh %exclude %_kde4_appsdir/ksgmltools2 %exclude %_kde4_appsdir/cmake -%exclude %_kde4_appsdir/kdeui/about/body-background.png +%exclude %_kde4_appsdir/kdeui/about/body-background.jpg %config %_kde_config_dir/* %config %_kde4_sysconfdir/xdg/menus/applications.menu.kde4 %dir %_kde4_sysconfdir/xdg/menus ++++++ kdelibs-4.5.95.tar.bz2 -> kdelibs-4.6.0.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-4.5.95.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-4.6.0.tar.bz2 differ: char 11, line 1 ++++++ plasma-libs.diff ++++++ --- /var/tmp/diff_new_pack.vVyjSD/_old 2011-02-01 18:41:58.000000000 +0100 +++ /var/tmp/diff_new_pack.vVyjSD/_new 2011-02-01 18:41:58.000000000 +0100 @@ -1,6 +1,6 @@ ---- plasma/corona.cpp 2010-11-19 11:52:27.000000000 +0100 -+++ plasma/corona.cpp 2010-12-22 13:55:23.765000006 +0100 -@@ -195,7 +195,9 @@ +--- plasma/corona.cpp ++++ plasma/corona.cpp +@@ -196,7 +196,9 @@ if (pluginName.isEmpty() || pluginName == "default") { // default to the desktop containment @@ -11,17 +11,17 @@ } bool loadingNull = pluginName == "null"; ---- plasma/private/containment_p.h 2010-11-19 11:52:26.000000000 +0100 -+++ plasma/private/containment_p.h 2010-12-22 13:55:23.766000006 +0100 +--- plasma/private/containment_p.h ++++ plasma/private/containment_p.h @@ -60,6 +60,7 @@ type(Containment::NoContainmentType), showDropZoneDelayTimer(0), drawWallpaper(true), + showToolBox(true), - dropZoneStarted(false) + dropZoneStarted(false), + containmentActionsSource(Global) { - } -@@ -183,6 +184,7 @@ +@@ -184,6 +185,7 @@ QHash<KJob*, KMenu*> dropMenus; QTimer *showDropZoneDelayTimer; bool drawWallpaper : 1; @@ -29,8 +29,8 @@ bool dropZoneStarted : 1; enum ContainmentActionsSource { ---- plasma/theme.cpp 2010-12-22 10:56:04.000000000 +0100 -+++ plasma/theme.cpp 2010-12-22 13:56:31.560000006 +0100 +--- plasma/theme.cpp ++++ plasma/theme.cpp @@ -78,7 +78,6 @@ colorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)), buttonColorScheme(QPalette::Active, KColorScheme::Button, KSharedConfigPtr(0)), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit strigi for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '11

01 Feb '11

Hello community, here is the log from the commit of package strigi for openSUSE:Factory checked in at Tue Feb 1 18:41:29 CET 2011. -------- --- strigi/strigi.changes 2010-12-14 18:01:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/strigi/strigi.changes 2011-01-28 11:47:56.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Jan 28 10:46:39 UTC 2011 - remur(a)gmx.net + +- Check file size of ole compound documents (bko#251701) + * Dolphin crashes when hovering a MSI file + +------------------------------------------------------------------- +Tue Jan 18 22:09:11 UTC 2011 - wstephenson(a)novell.com + +- Update to newer snapshot + * Fix double delete in libstreamindexer (bko#257944) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- strigi-0.7.3.tar.bz2 New: ---- bko_251701.v3.patch strigi-0.7.3.99.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strigi.spec ++++++ --- /var/tmp/diff_new_pack.dvCEtD/_old 2011-02-01 18:40:34.000000000 +0100 +++ /var/tmp/diff_new_pack.dvCEtD/_new 2011-02-01 18:40:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package strigi (Version 0.7.3) +# spec file for package strigi # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,10 +28,11 @@ Summary: Lightweight and fast desktop search engine BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.vandenoever.info/software/strigi/ -Version: 0.7.3 -Release: 3 +Version: 0.7.3.99 +Release: 1 Source: strigi-%{version}.tar.bz2 Source2: baselibs.conf +Patch0: bko_251701.v3.patch Provides: strigi-ui = 0.5.7 Obsoletes: strigi-ui <= 0.5.7 Requires: libstrigi0 = %version @@ -86,9 +87,11 @@ %prep %setup -q -n strigi-%{version} +%patch0 -p1 %build %cmake_kde4 + make %{?jobs:-j %jobs} %install ++++++ bko_251701.v3.patch ++++++ diff --git a/lib/oleinputstream.cpp b/lib/oleinputstream.cpp index c66e200..7286573 100644 --- a/libstreams/lib/oleinputstream.cpp +++ b/libstreams/lib/oleinputstream.cpp @@ -173,33 +173,39 @@ OleInputStream::Private::Private(OleInputStream* s, InputStream* input) stream->m_error = "Invalid OLE file."; return; } - int32_t max = 0; batIndex.reserve(nBat); data += 76; for (int i = 0; i < ::min(109, nBat); ++i) { int32_t p = readLittleEndianInt32(data+4*i); batIndex.push_back(p); - if (p > max) max = p; } - if (ptOffset > max) max = ptOffset; - if (128*(nBat-1) > max) max = 128*(nBat-1); - int32_t toread = (max+2)*512; - if (input->size() >= 0 && input->size() < toread) { + // this looks wrong? what's with input->size() < 0 + // toread = 10000000 later on, why not bail out here? +/* if (input->size() >= 0 && input->size() < toread) { stream->m_status = Error; stream->m_error = "File is incomplete."; return; - } - toread = (input->size() > 0) ?(int32_t)input->size() :10000000; - size = input->read(data, toread, toread); - input->reset(0); - if (size != input->size()) { + }*/ + + // stop the max block number guessing + // check for (nBat - 1) * 128 * 512 <= input-size() < nbat * 128 * 512 + // can there be a totally empty bat? (only -1), what happens with file size + int32_t minSize = (nBat - 1) * 128 * 512; + int32_t maxSize = nBat * 128 * 512; // +64k + + // we still have a 64k possible error window + size = input->read(data, maxSize, maxSize); + if (size < minSize) { + fprintf(stderr, "minSize: %d vs. size %d \n", minSize, size); stream->m_status = Error; stream->m_error = string("File cannot be read completely: ")+input->error(); return; } - maxindex = size/512-2; + input->reset(0); + + maxindex = size/512-2; // -1 -> header; -2 -> ? // read any remaining BAT entries from XBAT blocks xBatOffset = 512 + 512 * xBatOffset; @@ -211,6 +217,7 @@ OleInputStream::Private::Private(OleInputStream* s, InputStream* input) xBatOffset = 512+512*readLittleEndianInt32(data + 508 + xBatOffset); } +// check last sector for no of remaining secIDS // print all bat blocks /* for (size_t i = 0; i<batIndex.size(); ++i) { const char* b = data+(1+batIndex[i])*512; ++++++ strigi-0.7.3.tar.bz2 -> strigi-0.7.3.99.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/.gitmodules new/strigi-0.7.3.99/.gitmodules --- old/strigi-0.7.3/.gitmodules 1970-01-01 01:00:00.000000000 +0100 +++ new/strigi-0.7.3.99/.gitmodules 2011-01-18 22:01:10.000000000 +0100 @@ -0,0 +1,19 @@ +[submodule "strigiutils"] + path = strigiutils + url = http://anongit.kde.org/strigiutils + +[submodule "strigidaemon"] + path = strigidaemon + url = http://anongit.kde.org/strigidaemon + +[submodule "libstreams"] + path = libstreams + url = http://anongit.kde.org/libstreams + +[submodule "libstreamanalyzer"] + path = libstreamanalyzer + url = http://anongit.kde.org/libstreamanalyzer + +[submodule "strigiclient"] + path = strigiclient + url = http://anongit.kde.org/strigiclient diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/CMakeLists.txt new/strigi-0.7.3.99/CMakeLists.txt --- old/strigi-0.7.3/CMakeLists.txt 2010-03-22 07:11:53.000000000 +0100 +++ new/strigi-0.7.3.99/CMakeLists.txt 2011-01-18 22:01:10.000000000 +0100 @@ -8,15 +8,62 @@ # for testing to work in cmake, this command must be called in the root src dir enable_testing() +option(STRIGI_SYNC_SUBMODULES "Try to update the Strigi submodules automatically. Note that the update may fail if you have pending changes in one of the submodules." FALSE) + +if(STRIGI_SYNC_SUBMODULES) + find_program(GIT_EXECUTABLE NAMES git) + if(NOT GIT_EXECUTABLE) + message(FATAL_ERROR "Could not find git. Aborting.") + endif() +endif() + +macro(check_subdir _subDirectory) + message(STATUS "Checking: ${strigi_SOURCE_DIR}/${_subDirectory}/CMakeLists.txt") + if(NOT EXISTS "${strigi_SOURCE_DIR}/${_subDirectory}/CMakeLists.txt") + message(STATUS "No CMakeLists.txt found in ${_subDirectory}") + if(STRIGI_SYNC_SUBMODULES) + message(STATUS "Trying to download the ${_subDirectory} submodule") + execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init -- ${_subDirectory} + WORKING_DIRECTORY ${strigi_SOURCE_DIR}) + endif() + else() + if(STRIGI_SYNC_SUBMODULES) + message(STATUS "Trying to update the ${_subDirectory} submodule") + execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --rebase -- ${_subDirectory} + WORKING_DIRECTORY ${strigi_SOURCE_DIR}) + endif() + else() + set(showError 1) + endif() +endmacro() + +check_subdir(libstreams) +check_subdir(libstreamanalyzer) +check_subdir(strigiutils) +check_subdir(strigidaemon) +check_subdir(strigiclient) + if(MSVC) add_definitions(-wd4251) add_definitions(-wd4355) add_definitions(-D_CRT_SECURE_NO_DEPRECATE) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) + add_definitions(-D_USE_MATH_DEFINES) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Zc:wchar_t-") endif(MSVC) -add_subdirectory(libstreams) -add_subdirectory(libstreamanalyzer) -add_subdirectory(strigiutils) -add_subdirectory(strigidaemon) -add_subdirectory(strigiclient) +if(showError) + message(FATAL_ERROR "No CMakeLists.txt was found in one of your sources subdirectory\n" + "Make sure you downloaded the sub-modules files using:\n" + " git submodule update --init" + ) +else() + add_subdirectory(libstreams) + add_subdirectory(libstreamanalyzer) + add_subdirectory(strigiutils) + if(NOT MSVC) + add_subdirectory(strigidaemon) + add_subdirectory(strigiclient) + endif(NOT MSVC) +endif() + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/CMakeLists.txt new/strigi-0.7.3.99/libstreamanalyzer/CMakeLists.txt --- old/strigi-0.7.3/libstreamanalyzer/CMakeLists.txt 2010-11-02 10:41:31.000000000 +0100 +++ new/strigi-0.7.3.99/libstreamanalyzer/CMakeLists.txt 2011-01-18 22:01:29.000000000 +0100 @@ -25,7 +25,7 @@ set(CMAKE_INSTALL_RPATH ${LIB_DESTINATION} ) set(LIBSTREAMANALYZER_VERSION 0.7.3) -set(LIBSTREAMANALYZER_SOVERSION 0.7) +set(LIBSTREAMANALYZER_SOVERSION 0) option(BUILD_UTILS "build luceneindexer, xmlindexer, rdfindexer, ontoprint utilities" ON) option(BUILD_DEEPTOOLS "build deep find and deepgrep tools" ON) option(ENABLE_XINE @@ -53,6 +53,7 @@ # on FreeBSD dlopen is in libc, on GNU/Linux it's in libdl if(NOT WIN32) include(CheckFunctionExists) + include(CheckLibraryExists) check_library_exists(dl dlopen "" DLOPEN_IN_LIBDL) check_function_exists(dlopen DLOPEN_IN_LIBC) set(LIBDL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/lib/CMakeLists.txt new/strigi-0.7.3.99/libstreamanalyzer/lib/CMakeLists.txt --- old/strigi-0.7.3/libstreamanalyzer/lib/CMakeLists.txt 2010-10-26 16:15:54.000000000 +0200 +++ new/strigi-0.7.3.99/libstreamanalyzer/lib/CMakeLists.txt 2011-01-18 22:01:29.000000000 +0100 @@ -31,7 +31,6 @@ endanalyzers/cpioendanalyzer.cpp endanalyzers/flacendanalyzer.cpp endanalyzers/gzipendanalyzer.cpp - endanalyzers/helperendanalyzer.cpp endanalyzers/id3endanalyzer.cpp endanalyzers/lzmaendanalyzer.cpp endanalyzers/mailendanalyzer.cpp @@ -58,6 +57,17 @@ xesamparser.cpp ) +if(MSVC) + list(APPEND streamanalyzer_SRCS + stgdirent.cpp + stgdirent.h + ) +else(MSVC) + list(APPEND streamanalyzer_SRCS + endanalyzers/helperendanalyzer.cpp + ) +endif(MSVC) + add_library(streamanalyzerstatic STATIC ${streamanalyzer_SRCS}) set(streamanalyzer_libs ${LIBSTREAMS_LIBRARIES} ${LIBXML2_LIBRARIES} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/lib/analyzerloader.cpp new/strigi-0.7.3.99/libstreamanalyzer/lib/analyzerloader.cpp --- old/strigi-0.7.3/libstreamanalyzer/lib/analyzerloader.cpp 2010-04-17 16:15:08.000000000 +0200 +++ new/strigi-0.7.3.99/libstreamanalyzer/lib/analyzerloader.cpp 2011-01-18 22:01:29.000000000 +0100 @@ -21,6 +21,7 @@ #include <strigi/analyzerplugin.h> #include <string> #include <iostream> +#include <iterator> #include <cstdio> #include <cstring> #include <assert.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/lib/diranalyzer.cpp new/strigi-0.7.3.99/libstreamanalyzer/lib/diranalyzer.cpp --- old/strigi-0.7.3/libstreamanalyzer/lib/diranalyzer.cpp 2010-03-17 00:47:37.000000000 +0100 +++ new/strigi-0.7.3.99/libstreamanalyzer/lib/diranalyzer.cpp 2011-01-18 22:01:29.000000000 +0100 @@ -33,6 +33,16 @@ using namespace Strigi; using namespace std; +// MSVC doesn't define them +#ifdef _MSC_VER +# define _IFMT 0170000 // type of file +# define _IFDIR 0040000 // directory +# define _IFREG 0100000 // regular +# define S_ISDIR(m) (((m)&_IFMT) == _IFDIR) +# define S_ISREG(m) (((m)&_IFMT) == _IFREG) +#endif + + class DirAnalyzer::Private { public: DirLister dirlister; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/lib/fieldpropertiesdb.cpp new/strigi-0.7.3.99/libstreamanalyzer/lib/fieldpropertiesdb.cpp --- old/strigi-0.7.3/libstreamanalyzer/lib/fieldpropertiesdb.cpp 2010-03-17 00:47:37.000000000 +0100 +++ new/strigi-0.7.3.99/libstreamanalyzer/lib/fieldpropertiesdb.cpp 2011-01-18 22:01:29.000000000 +0100 @@ -24,6 +24,7 @@ #include <vector> #include <map> #include <iostream> +#include <iterator> #include <set> #include <cstdlib> #include <cstring> @@ -40,6 +41,10 @@ #include <sys/stat.h> #include <config.h> +#ifdef _MSC_VER +# define strcasecmp stricmp +#endif + using namespace Strigi; using namespace std; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/lib/lineanalyzers/m3ustreamanalyzer.cpp new/strigi-0.7.3.99/libstreamanalyzer/lib/lineanalyzers/m3ustreamanalyzer.cpp --- old/strigi-0.7.3/libstreamanalyzer/lib/lineanalyzers/m3ustreamanalyzer.cpp 2010-03-17 00:47:37.000000000 +0100 +++ new/strigi-0.7.3.99/libstreamanalyzer/lib/lineanalyzers/m3ustreamanalyzer.cpp 2011-01-18 22:01:29.000000000 +0100 @@ -16,7 +16,7 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. * - * $Id: m3ustreamanalyzer.cpp 1104187 2010-03-16 23:47:37Z vandenoever $ + * $Id$ */ #include "m3ustreamanalyzer.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/lib/lineanalyzers/m3ustreamanalyzer.h new/strigi-0.7.3.99/libstreamanalyzer/lib/lineanalyzers/m3ustreamanalyzer.h --- old/strigi-0.7.3/libstreamanalyzer/lib/lineanalyzers/m3ustreamanalyzer.h 2010-03-17 00:47:37.000000000 +0100 +++ new/strigi-0.7.3.99/libstreamanalyzer/lib/lineanalyzers/m3ustreamanalyzer.h 2011-01-18 22:01:29.000000000 +0100 @@ -16,7 +16,7 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. * - * $Id: m3ustreamanalyzer.h 1104187 2010-03-16 23:47:37Z vandenoever $ + * $Id$ */ #ifndef M3USTREAMANALYZER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/lib/pdf/pdfparser.cpp new/strigi-0.7.3.99/libstreamanalyzer/lib/pdf/pdfparser.cpp --- old/strigi-0.7.3/libstreamanalyzer/lib/pdf/pdfparser.cpp 2010-08-12 12:41:40.000000000 +0200 +++ new/strigi-0.7.3.99/libstreamanalyzer/lib/pdf/pdfparser.cpp 2011-01-18 22:01:29.000000000 +0100 @@ -34,10 +34,10 @@ StreamStatus PdfParser::read(int32_t min, int32_t max) { int32_t off = (int32_t)(pos-start); - int32_t d = (int32_t)(stream->position() - objdefstart); + int32_t d = (int32_t)(stream->position() - bufferStart); min += d; if (max > 0) max += d; - stream->reset(objdefstart); + stream->reset(bufferStart); int32_t n = stream->read(start, min, max); // printf("objstart %i %i\n", d, n); if (n < min) return stream->status(); @@ -46,19 +46,10 @@ return Ok; } StreamStatus -PdfParser::read2(int32_t min, int32_t max) { -// printf("pos %lli\n", stream->position()); - int32_t n = stream->read(start, min, max); - if (n < min) return stream->status(); - pos = start; - end = pos + n; - return Ok; -} -StreamStatus PdfParser::checkForData(int32_t m) { - StreamStatus n = Eof; + StreamStatus n = Ok; if (end - pos < m) { - n = read(m, 0); + n = read(m - (int32_t) (end-pos), 0); } // fprintf(stderr, "checkForData %i\n", n); return n; @@ -369,7 +360,7 @@ pos++; // read stream until 'endstream' - int64_t p = pos-start; + int64_t p = bufferStart + pos-start; if (p != stream->reset(p)) return Error; // fprintf(stderr, "filter: %s\n", filter.c_str()); // fprintf(stderr, "type: %s %i\n", type.c_str(), streamcount); @@ -380,20 +371,18 @@ filter) != Eof) { return Error; } - p += sub.size(); } else { SubInputStream sub(stream, length); if (handleSubStream(&sub, type, offset, numberofobjects, hasfilter, filter) != Eof) { return Error; } - p += sub.size(); } - if (p != stream->reset(p)) return Error; - if (read(1, 0) != Ok) return Error; - pos = start + p; - //pos = start + (stream->position()-objdefstart); -// printf("hi %i\n", off+(pos-start)); + // After reading the substream the pointers to the buffer are invalid. + // Reset the buffer to the current stream position + start = pos = end = 0; + bufferStart = stream->position(); + //if (read(1, 0) != Ok) return Error; //printf("hi %i\n", *pos); if (skipWhitespaceOrComment() != Ok) return Error; // printf("hi %i %.*s\n", pos-start, 10, pos); @@ -490,7 +479,7 @@ PdfParser::parseObjectStream(StreamBase<char>* s, int32_t offset, int32_t n) { stream = s; end = pos = start = 0; - objdefstart = 0; + bufferStart = 0; stream->skip(offset); StreamStatus r = Ok; @@ -510,7 +499,7 @@ PdfParser::parseContentStream(StreamBase<char>* s) { stream = s; end = pos = start = 0; - objdefstart = 0; + bufferStart = 0; StreamStatus r = skipWhitespaceOrComment(); // fprintf(stderr, "eh %i %i\n", r, Eof); if (r != Ok) return r; @@ -557,7 +546,6 @@ } StreamStatus PdfParser::parseObjectStreamObjectDef() { -// objdefstart = pos-start; if (*pos == 'x') return skipXRef(); if (*pos == 't') return skipTrailer(); if (*pos == 's') return skipStartXRef(); @@ -576,16 +564,13 @@ } StreamStatus PdfParser::parse(StreamBase<char>* stream) { - // for now we need to load the entire stream in memory :( - // this is due to a sneaky bug somewhere, not a design issue - forwardStream(stream); stream->reset(0); StreamStatus r; // initialize the stream status this->stream = stream; end = pos = start = 0; - objdefstart = 0; + bufferStart = 0; // initialize the parsed field containers lastNumber = -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/lib/pdf/pdfparser.h new/strigi-0.7.3.99/libstreamanalyzer/lib/pdf/pdfparser.h --- old/strigi-0.7.3/libstreamanalyzer/lib/pdf/pdfparser.h 2010-03-17 00:47:37.000000000 +0100 +++ new/strigi-0.7.3.99/libstreamanalyzer/lib/pdf/pdfparser.h 2011-01-18 22:01:29.000000000 +0100 @@ -45,7 +45,7 @@ const char* start; const char* end; const char* pos; - int64_t objdefstart; + int64_t bufferStart; Strigi::StreamBase<char>* stream; std::string m_error; @@ -62,7 +62,6 @@ Strigi::StreamStatus read(int32_t min, int32_t max); void forwardStream(Strigi::StreamBase<char>* s); - Strigi::StreamStatus read2(int32_t min, int32_t max); Strigi::StreamStatus checkForData(int32_t m); bool isInString(char c, const char* s, int32_t n); Strigi::StreamStatus skipFromString(const char*str, int32_t n); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/lib/streamanalyzer.cpp new/strigi-0.7.3.99/libstreamanalyzer/lib/streamanalyzer.cpp --- old/strigi-0.7.3/libstreamanalyzer/lib/streamanalyzer.cpp 2010-04-17 16:15:08.000000000 +0200 +++ new/strigi-0.7.3.99/libstreamanalyzer/lib/streamanalyzer.cpp 2011-01-18 22:01:29.000000000 +0100 @@ -331,13 +331,9 @@ addFactory(new PdfEndAnalyzerFactory()); addFactory(new SdfEndAnalyzerFactory()); addFactory(new LzmaEndAnalyzerFactory()); -#ifdef WIN32 -#ifdef __GNUC__ -#warning FIXME - IFilterEndAnalyzerFactory is pure virtual! -// addFactory(new IFilterEndAnalyzerFactory()); -#endif -#endif +#ifndef _MSC_VER addFactory(new HelperEndAnalyzerFactory()); +#endif addFactory(new TextEndAnalyzerFactory()); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp new/strigi-0.7.3.99/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp --- old/strigi-0.7.3/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2010-10-31 16:15:35.000000000 +0100 +++ new/strigi-0.7.3.99/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2011-01-18 22:01:29.000000000 +0100 @@ -314,7 +314,7 @@ AVProbeData pd; const char *buf; pd.filename =""; - pd.buf_size = in->read(buf,262144,262144); + pd.buf_size = in->read(buf,262144,262144) - AVPROBE_PADDING_SIZE; pd.buf = (unsigned char*)buf; in->reset(0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexreader.cpp new/strigi-0.7.3.99/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexreader.cpp --- old/strigi-0.7.3/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexreader.cpp 2010-03-17 00:47:37.000000000 +0100 +++ new/strigi-0.7.3.99/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexreader.cpp 2011-01-18 22:01:29.000000000 +0100 @@ -309,6 +309,15 @@ t = createKeywordTerm(fieldname.c_str(), query.term().string()); q = _CLNEW TermQuery(t); break; + case Strigi::Query::Contains: + t = createWildCardTerm(fieldname.c_str(), "*" + val + "*"); + q = _CLNEW WildcardQuery(t); + break; + case Strigi::Query::StartsWith: + t = createWildCardTerm(fieldname.c_str(), val + "*"); + q = _CLNEW WildcardQuery(t); + break; + case Strigi::Query::Equals: default: if (strpbrk(val.c_str(), "*?")) { t = createWildCardTerm(fieldname.c_str(), val); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreamanalyzer/plugins/indexers/cluceneindexer/luceneindexer.cpp new/strigi-0.7.3.99/libstreamanalyzer/plugins/indexers/cluceneindexer/luceneindexer.cpp --- old/strigi-0.7.3/libstreamanalyzer/plugins/indexers/cluceneindexer/luceneindexer.cpp 2010-03-17 00:47:37.000000000 +0100 +++ new/strigi-0.7.3.99/libstreamanalyzer/plugins/indexers/cluceneindexer/luceneindexer.cpp 2011-01-18 22:01:29.000000000 +0100 @@ -27,7 +27,11 @@ #include <iostream> #include <sys/types.h> #include <CLucene.h> -#include <CLucene/util/dirent.h> +#ifdef _MSC_VER +# include <stgdirent.h> +#else +# include <CLucene/util/dirent.h> +#endif using namespace std; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreams/StrigiConfig.cmake.in new/strigi-0.7.3.99/libstreams/StrigiConfig.cmake.in --- old/strigi-0.7.3/libstreams/StrigiConfig.cmake.in 2010-05-20 18:09:25.000000000 +0200 +++ new/strigi-0.7.3.99/libstreams/StrigiConfig.cmake.in 2011-01-18 22:01:34.000000000 +0100 @@ -20,7 +20,6 @@ # No need to test for it, since here we know exactly what we have. set(STRIGI_NEEDS_SIGNED_CHAR TRUE) set(STRIGI_NEEDS_CHAR FALSE) -message(STATUS "Strigi API needs 'signed char'") # get path of this file and go three levels up (this is equivalent to # the CMAKE_INSTALL_PREFIX if LIB_DESTINATION is not set) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreams/lib/CMakeLists.txt new/strigi-0.7.3.99/libstreams/lib/CMakeLists.txt --- old/strigi-0.7.3/libstreams/lib/CMakeLists.txt 2010-03-17 00:47:37.000000000 +0100 +++ new/strigi-0.7.3.99/libstreams/lib/CMakeLists.txt 2011-01-18 22:01:34.000000000 +0100 @@ -47,6 +47,7 @@ add_library(streamsstatic STATIC ${streams_SRCS}) set_target_properties(streamsstatic PROPERTIES DEFINE_SYMBOL MAKE_STREAMS_LIB) +target_link_libraries(streamsstatic ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${ICONV_LIBRARIES}) add_library(streams SHARED ${streams_SRCS}) set_target_properties(streams PROPERTIES @@ -54,7 +55,7 @@ SOVERSION ${STRIGI_VERSION_MAJOR} DEFINE_SYMBOL MAKE_STREAMS_LIB ) -target_link_libraries(streams streamsstatic) +target_link_libraries(streams ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${ICONV_LIBRARIES}) install(TARGETS streams LIBRARY DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION bin @@ -62,7 +63,6 @@ ) -target_link_libraries(streamsstatic ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${ICONV_LIBRARIES}) if(NOT WIN32) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libstreams.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libstreams.pc) endif(NOT WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/libstreams/lib/mailinputstream.cpp new/strigi-0.7.3.99/libstreams/lib/mailinputstream.cpp --- old/strigi-0.7.3/libstreams/lib/mailinputstream.cpp 2010-08-22 01:47:56.000000000 +0200 +++ new/strigi-0.7.3.99/libstreams/lib/mailinputstream.cpp 2011-01-18 22:01:34.000000000 +0100 @@ -201,16 +201,6 @@ } return decoded; } -bool -checkHeaderKey(const char* data, int32_t left) { - if (left >= 9 && strncasecmp("Received:", data, 9) == 0) { - return true; - } - if (left >= 5 && strncasecmp("From:", data, 5) == 0) { - return true; - } - return false; -} /** * Validate a mail header. The header format is checked, but not the presence @@ -219,59 +209,105 @@ **/ bool MailInputStream::checkHeader(const char* data, int32_t datasize) { - // the fileheader should contain a required header and have at least 5 - // header lines - // 'Received' or 'From' (case insensitive) - int linecount = 1; - bool key = true; - bool slashr = false; - int32_t pos = 0; - bool reqheader = checkHeaderKey(data, datasize); - char prevc = 0; + + /** + * Describes the possible states the parser can be in. + */ + enum MessageParserState { + InHeaderNameField, ///< The header name is parsed + InHeaderValueField, ///< The header value is parsed + MaybeOnNewLine, ///< A \r has been discovered while InHeaderValueField + PossibleHeaderNameField, ///< After a \r\n check if it is a new line or a folded line + MaybeEndOfHeaders, ///< A \r has been discovered while in PossibleHeaderNameField + InBody ///< The body part is parsed + }; + + /** + * The state machine of the parser has the following structure: + * + * @dot + * digraph MessageParser { + * InHeaderNameField -> InHeaderValueField [label=":"] + * InHeaderValueField -> MaybeNewLine [label="\\r"] + * MaybeOnNewLine -> PossibleHeaderNameField [label="\\n"] + * MaybeOnNewLine -> InHeaderValueField + * PossibleHeaderNameField -> InHeaderValueField [label="<SPACE>"] + * PossibleHeaderNameField -> MaybeEndOfHeaders [label="\\r"] + * PossibleHeaderNameField -> InHeaderNameField + * MaybeEndOfHeaders -> InBody [label="\\n"] + * } + * @enddot + */ + + MessageParserState currentState = InHeaderNameField; + + int pos = 0; while (pos < datasize) { - unsigned char c = data[pos++]; - if (slashr) { - slashr = false; - if (c == '\n') { - if (!reqheader) { - reqheader = checkHeaderKey(data+pos, datasize-pos); - } - continue; + char currentChar = data[pos]; + + switch(currentState) { + case InHeaderNameField: + if (currentChar == ':') { + currentState = InHeaderValueField; + } else if (currentChar == ' ' || currentChar == '\t') { + // is SPACE + return false; + } else if (currentChar < 0 || currentChar >= 128) { + // is not CHAR + return false; + } else if ((currentChar >= 0 && currentChar <= 31) || currentChar == 127) { + // is CTRL + return false; } - } - if (key) { - if (c == ':' || (isblank(c) && isspace(prevc))) { - // ':' signals the end of the key, a line starting with space - // is a continuation of the previous line's value - key = false; - } else if ((c == '\n' || c == '\r') && reqheader && linecount >= 5 - && (prevc == '\n' || prevc == '\r')) { - // if at least 5 header lines were read and an empty line is - // encountered, the mail header is valid - return true; - } else if (c != '-' && c != '.' && c != '_' && !isalnum(c) - && c != '#') { - // an invalid character in the key - return false; - } - } else { - // check that the text is 7-bit - if (c == '\n' || c == '\r') { - // a new line starts, so a new key - key = true; - linecount++; - // enable reading of \r\n line endings - if (c == '\r') { - slashr = true; - } else if (!reqheader) { - reqheader = checkHeaderKey(data+pos, datasize-pos); - } + break; + case InHeaderValueField: + if (currentChar == '\r') { + currentState = MaybeOnNewLine; + } else if (currentChar < 0 || currentChar >= 128) { + // is not CHAR + return false; + } + break; + case MaybeOnNewLine: + if (currentChar == '\n') { + currentState = PossibleHeaderNameField; + } else { + currentState = InHeaderValueField; + continue; // re-evaluate this character in InHeaderValueField state + } + break; + case PossibleHeaderNameField: + if (currentChar == ' ' || currentChar == '\t') { + currentState = InHeaderValueField; + } else if (currentChar == '\r') { + currentState = MaybeEndOfHeaders; + } else { + currentState = InHeaderNameField; + continue; // re-evaluate this character in InHeaderNameField state + } + break; + case MaybeEndOfHeaders: + if (currentChar == '\n') { + currentState = InBody; + } else { + // the only alternative follow state would be InHeaderNameField, but this doesn't allow \r + return false; } + break; + case InBody: + if (currentChar < 0 || currentChar >= 128) { + // is not CHAR + return false; + } + break; } - prevc = c; + + pos++; } - return reqheader && linecount >= 5; + + return true; } + class MailInputStream::Private { public: MailInputStream* const m; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/strigidaemon/bin/combinedindex/combinedindexmanager.cpp new/strigi-0.7.3.99/strigidaemon/bin/combinedindex/combinedindexmanager.cpp --- old/strigi-0.7.3/strigidaemon/bin/combinedindex/combinedindexmanager.cpp 2010-03-17 00:47:37.000000000 +0100 +++ new/strigi-0.7.3.99/strigidaemon/bin/combinedindex/combinedindexmanager.cpp 2011-01-18 22:01:44.000000000 +0100 @@ -45,6 +45,7 @@ #include <string> #include <set> #include <map> +#include <iterator> using namespace std; using namespace Strigi; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/strigidaemon/bin/daemon/dbus/CMakeLists.txt new/strigi-0.7.3.99/strigidaemon/bin/daemon/dbus/CMakeLists.txt --- old/strigi-0.7.3/strigidaemon/bin/daemon/dbus/CMakeLists.txt 2010-03-17 00:47:37.000000000 +0100 +++ new/strigi-0.7.3.99/strigidaemon/bin/daemon/dbus/CMakeLists.txt 2011-01-18 22:01:44.000000000 +0100 @@ -3,6 +3,7 @@ # if available, use Perl for generating the dbus interfaces. # otherwise, just copy them into the build directory find_package(Perl) +find_package(LibDBus) MACRO(CreateDBusBinding HEADERFILE INAME INTERFACE EXTRAINCLUDE) IF (PERL_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/strigidaemon/cmake/FindLibDBus.cmake new/strigi-0.7.3.99/strigidaemon/cmake/FindLibDBus.cmake --- old/strigi-0.7.3/strigidaemon/cmake/FindLibDBus.cmake 2010-04-17 16:12:15.000000000 +0200 +++ new/strigi-0.7.3.99/strigidaemon/cmake/FindLibDBus.cmake 2011-01-18 22:01:44.000000000 +0100 @@ -8,7 +8,6 @@ # DBUSLAUNCH_EXECUTABLE - the path to the dbus-launch executable for testing if(WIN32) - file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) find_path(DBUS_INCLUDE_DIRS dbus/dbus.h ${_program_FILES_DIR}/dbus/include @@ -16,7 +15,7 @@ ${CMAKE_INCLUDE_PATH} ) set(DBUS_LIBRARY_DIRS ${_program_FILES_DIR}/dbus/lib) - find_library(DBUS_LIBRARIES NAMES dbus dbus-1 + find_library(DBUS_LIBRARIES NAMES dbus dbus-1 dbus-1d PATHS ${DBUS_LIBRARY_DIRS} ${CMAKE_INSTALL_PREFIX}/lib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/strigiutils/CMakeLists.txt new/strigi-0.7.3.99/strigiutils/CMakeLists.txt --- old/strigi-0.7.3/strigiutils/CMakeLists.txt 2010-03-19 12:36:56.000000000 +0100 +++ new/strigi-0.7.3.99/strigiutils/CMakeLists.txt 2011-01-18 22:01:49.000000000 +0100 @@ -49,15 +49,19 @@ ##### installing ##### file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "") -add_executable(deepfind dummy.cpp) -target_link_libraries(deepfind libdeepfind) -install(TARGETS deepfind RUNTIME DESTINATION bin) -add_executable(deepgrep dummy.cpp) -target_link_libraries(deepgrep libdeepgrep) -install(TARGETS deepgrep RUNTIME DESTINATION bin) -add_executable(xmlindexer dummy.cpp) -target_link_libraries(xmlindexer libxmlindexer) -install(TARGETS xmlindexer RUNTIME DESTINATION bin) -add_executable(rdfindexer dummy.cpp) -target_link_libraries(rdfindexer librdfindexer) -install(TARGETS rdfindexer RUNTIME DESTINATION bin) +if(HAVE_REGEX_H) + add_executable(deepfind dummy.cpp) + target_link_libraries(deepfind libdeepfind) + install(TARGETS deepfind RUNTIME DESTINATION bin) + add_executable(deepgrep dummy.cpp) + target_link_libraries(deepgrep libdeepgrep) + install(TARGETS deepgrep RUNTIME DESTINATION bin) +endif(HAVE_REGEX_H) +if(NOT MSVC) + add_executable(xmlindexer dummy.cpp) + target_link_libraries(xmlindexer libxmlindexer) + install(TARGETS xmlindexer RUNTIME DESTINATION bin) + add_executable(rdfindexer dummy.cpp) + target_link_libraries(rdfindexer librdfindexer) + install(TARGETS rdfindexer RUNTIME DESTINATION bin) +endif(NOT MSVC) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strigi-0.7.3/strigiutils/bin/CMakeLists.txt new/strigi-0.7.3.99/strigiutils/bin/CMakeLists.txt --- old/strigi-0.7.3/strigiutils/bin/CMakeLists.txt 2010-03-22 07:11:53.000000000 +0100 +++ new/strigi-0.7.3.99/strigiutils/bin/CMakeLists.txt 2011-01-18 22:01:49.000000000 +0100 @@ -2,4 +2,6 @@ if(HAVE_REGEX_H) add_subdirectory(deepfind) endif(HAVE_REGEX_H) -add_subdirectory(xmlindexer) +if(NOT MSVC) + add_subdirectory(xmlindexer) +endif(NOT MSVC) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phonon for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '11

01 Feb '11

Hello community, here is the log from the commit of package phonon for openSUSE:Factory checked in at Tue Feb 1 18:40:13 CET 2011. -------- --- KDE/phonon/phonon.changes 2010-11-25 19:09:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/phonon/phonon.changes 2011-01-24 21:42:01.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 13 15:35:06 UTC 2011 - toddrme2178(a)gmail.com + +- update to 4.4.4 +- split off xine and gstreamer backends to their own packages + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- phonon-4.4.3.tar.bz2 phonon-backend-xine.changes phonon-backend-xine.spec New: ---- phonon-4.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon.spec ++++++ --- /var/tmp/diff_new_pack.bLzxrL/_old 2011-02-01 18:39:25.000000000 +0100 +++ /var/tmp/diff_new_pack.bLzxrL/_new 2011-02-01 18:39:25.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package phonon (Version 4.4.3) +# spec file for package phonon # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -20,23 +20,21 @@ Name: phonon BuildRequires: automoc4 cmake kde4-filesystem libpulse-devel libqt4-devel BuildRequires: fdupes -Version: 4.4.3 +Version: 4.4.4 Release: 1 License: LGPLv2.0+ Url: http://phonon.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: Development/Libraries/KDE -Summary: Phonon Multimedia Platform Abstraction +Group: System/GUI/KDE +Summary: Multimedia Platform Abstraction Source0: %name-%{version}.tar.bz2 Source1: baselibs.conf -%if %suse_version > 1030 %requires_ge libqt4 -%endif Requires: phonon-backend >= %version Requires: libphonon4 = %version %description -Phonon is a cross-platform portable Multimedia Support Abstraction, +Phonon is a cross-platform portable multimedia support abstraction, which allows you to play multiple audio or video formats with the same quality on all platforms, no matter which underlying architecture is used. @@ -70,7 +68,7 @@ %package -n libphonon4 License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction -Group: Development/Libraries/KDE +Group: System/Libraries %requires_ge libqt4-x11 %description -n libphonon4 @@ -93,7 +91,7 @@ %makeinstall install -d -m 0755 $RPM_BUILD_ROOT/%_libdir/kde4/plugins install -d -m 0755 $RPM_BUILD_ROOT/%_libdir/kde4/plugins/phonon_backend - %fdupes $RPM_BUILD_ROOT/usr/include + %fdupes $RPM_BUILD_ROOT%{_includedir} %clean rm -rf "$RPM_BUILD_ROOT" @@ -104,11 +102,9 @@ %files %defattr(-,root,root) -%if %suse_version > 1010 %dir %_kde4_modules/plugins %dir %_kde4_modules/plugins/phonon_backend -%endif -/usr/share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml +%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml %files -n libphonon4 %defattr(-,root,root) @@ -119,13 +115,25 @@ %files devel %defattr(-,root,root) -/usr/include/phonon -%dir /usr/include/KDE -%dir /usr/share/qt4/mkspecs/modules/ -/usr/include/KDE/Phonon +%{_includedir}/phonon +%dir %{_includedir}/KDE +%dir %{_datadir}/qt4/mkspecs/modules/ +%{_includedir}/KDE/Phonon %_libdir/libphonon.so %_libdir/libphononexperimental.so %_libdir/pkgconfig/phonon.pc -/usr/share/qt4/mkspecs/modules/qt_phonon.pri +%dir %{_datadir}/phonon-buildsystem +%{_datadir}/qt4/mkspecs/modules/qt_phonon.pri +%{_datadir}/phonon-buildsystem/FindAutomoc4.cmake +%{_datadir}/phonon-buildsystem/FindPackageHandleStandardArgs.cmake +%{_datadir}/phonon-buildsystem/FindPhonon.cmake +%{_datadir}/phonon-buildsystem/FindPhononInternal.cmake +%{_datadir}/phonon-buildsystem/FindQt4.cmake +%{_datadir}/phonon-buildsystem/MacroEnsureVersion.cmake +%{_datadir}/phonon-buildsystem/MacroLogFeature.cmake +%{_datadir}/phonon-buildsystem/MacroOptionalFindPackage.cmake +%{_datadir}/phonon-buildsystem/MacroPushRequiredVars.cmake +%{_datadir}/phonon-buildsystem/PhononMacros.cmake +%{_datadir}/phonon-buildsystem/cmake_uninstall.cmake.in %changelog ++++++ phonon-4.4.3.tar.bz2 -> phonon-4.4.4.tar.bz2 ++++++ ++++ 58038 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde4-filesystem for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '11

01 Feb '11

Hello community, here is the log from the commit of package kde4-filesystem for openSUSE:Factory checked in at Tue Feb 1 18:39:07 CET 2011. -------- --- KDE/kde4-filesystem/kde4-filesystem.changes 2011-01-10 14:20:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/kde4-filesystem/kde4-filesystem.changes 2011-01-19 23:12:41.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 19 23:12:21 CET 2011 - dmueller(a)suse.de + +- bump version requirements to 4.6.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.Oxlefe/_old 2011-02-01 18:30:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Oxlefe/_new 2011-02-01 18:30:59.000000000 +0100 @@ -20,8 +20,8 @@ Name: kde4-filesystem Url: http://www.kde.org -Version: 4.5.95 -Release: 2 +Version: 4.6.0 +Release: 1 License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/GUI/KDE ++++++ macros.kde4 ++++++ --- /var/tmp/diff_new_pack.Oxlefe/_old 2011-02-01 18:30:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Oxlefe/_new 2011-02-01 18:30:59.000000000 +0100 @@ -27,8 +27,8 @@ %_kde4_modules %{_kde4_modulesdir} %_kde4_servicetypes %{_kde4_servicetypesdir} -%_kde_platform_version 4.5.95 -%_kde_pimlibs_version 4.5.95 +%_kde_platform_version 4.6.0 +%_kde_pimlibs_version 4.6.0 %_kde_akonadi_version 1.4.95 %kde4_runtime_requires Requires: kdebase4-runtime >= %_kde_platform_version libqt4-x11 >= 4.7.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '11

01 Feb '11

Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at Tue Feb 1 18:30:37 CET 2011. -------- --- NetworkManager/NetworkManager.changes 2011-01-17 09:51:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes 2011-01-30 20:59:31.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Jan 30 11:16:04 CET 2011 - bjorn.lie(a)gmail.com + +- Add nm-ignore-temp-files.patch: stop NM from filling dmesg and + logs by ignoring temporary files (bgo#602868) (bnc#668183) + Original upstream patch has been extended to also touch + Makefile.in in order to avoid having to re-bootstrap. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nm-ignore-temp-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.AQVNTb/_old 2011-02-01 18:26:00.000000000 +0100 +++ /var/tmp/diff_new_pack.AQVNTb/_new 2011-02-01 18:26:00.000000000 +0100 @@ -20,7 +20,7 @@ Name: NetworkManager Url: http://www.gnome.org/projects/NetworkManager/ Version: 0.8.2 -Release: 5 +Release: 6 License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel dbus-1-glib-devel gtk-doc intltool iptables libgcrypt-devel libgudev-1_0-devel libiw-devel libnl-devel libtool libuuid-devel mozilla-nss-devel polkit-devel ppp-devel translation-update-upstream wireless-tools @@ -39,6 +39,8 @@ Patch1: nm-nis-domain.diff # PATCH-FIX_USPTREAM nm-crash-lack-ipv4.patch jeffm(a)suse.de -- Taken from git Patch2: nm-crash-lack-ipv4.patch +# PATCH-FIX-UPSTREAM nm-ignore-temp-files.patch bgo#602868 bnc#668183 bjorn.lie(a)gmail.com -- Silence on warning for non-existing temp files. Taken from git +Patch3: nm-ignore-temp-files.patch Requires: %{name}-glib = %{version} Requires: dhcp-client Requires: iproute2 @@ -110,6 +112,7 @@ %patch0 %patch1 %patch2 -p1 +%patch3 -p1 translation-update-upstream %build ++++++ nm-ignore-temp-files.patch ++++++ >From 41167ce95603b56a39f808b9f14389bc8db3ea8c Mon Sep 17 00:00:00 2001 From: Jiří Klimeš <jklimes(a)redhat.com> Date: Wed, 10 Nov 2010 15:21:25 +0000 Subject: keyfile: ignore temporary files (bgo #602868) Ignore temporary files created by vim editor and temporary files created internally by g_file_set_contents() (mkstemp()) when writing connections. --- Index: NetworkManager-0.8.2/system-settings/plugins/keyfile/Makefile.am =================================================================== --- NetworkManager-0.8.2.orig/system-settings/plugins/keyfile/Makefile.am +++ NetworkManager-0.8.2/system-settings/plugins/keyfile/Makefile.am @@ -16,6 +16,8 @@ libkeyfile_io_la_SOURCES = \ writer.c \ writer.h \ errors.c \ + utils.c \ + utils.h \ common.h libkeyfile_io_la_CPPFLAGS = \ Index: NetworkManager-0.8.2/system-settings/plugins/keyfile/common.h =================================================================== --- NetworkManager-0.8.2.orig/system-settings/plugins/keyfile/common.h +++ NetworkManager-0.8.2/system-settings/plugins/keyfile/common.h @@ -23,6 +23,9 @@ #include <glib.h> +#define SWP_TAG ".swp" +#define SWPX_TAG ".swpx" + #define KEYFILE_PLUGIN_NAME "keyfile" #define KEYFILE_PLUGIN_INFO "(c) 2007 - 2010 Red Hat, Inc. To report bugs please use the NetworkManager mailing list." Index: NetworkManager-0.8.2/system-settings/plugins/keyfile/plugin.c =================================================================== --- NetworkManager-0.8.2.orig/system-settings/plugins/keyfile/plugin.c +++ NetworkManager-0.8.2/system-settings/plugins/keyfile/plugin.c @@ -39,6 +39,7 @@ #include "nm-keyfile-connection.h" #include "writer.h" #include "common.h" +#include "utils.h" #define CONF_FILE SYSCONFDIR "/NetworkManager/NetworkManager.conf" #define OLD_CONF_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf" @@ -89,6 +90,9 @@ read_connections (NMSystemConfigInterfac NMKeyfileConnection *connection; char *full_path; + if (utils_should_ignore_file (item)) + continue; + full_path = g_build_filename (KEYFILE_DIR, item, NULL); PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "parsing %s ... ", item); connection = nm_keyfile_connection_new (full_path, &error); @@ -192,6 +196,11 @@ dir_changed (GFileMonitor *monitor, GError *error = NULL; name = g_file_get_path (file); + if (utils_should_ignore_file (name)) { + g_free (name); + return; + } + connection = g_hash_table_lookup (priv->hash, name); switch (event_type) { Index: NetworkManager-0.8.2/system-settings/plugins/keyfile/utils.c =================================================================== --- /dev/null +++ NetworkManager-0.8.2/system-settings/plugins/keyfile/utils.c @@ -0,0 +1,97 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager system settings service + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (C) Copyright 2010 Red Hat, Inc. + */ + +#include <glib.h> +#include <stdlib.h> +#include <string.h> +#include "utils.h" + + +static const char temp_letters[] = +"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + +/* + * Check '.[a-zA-Z0-9]{6}' file suffix used for temporary files by g_file_set_contents() (mkstemp()). + */ +static gboolean +check_mkstemp_suffix (const char *path) +{ + const char *ptr; + + g_return_val_if_fail (path != NULL, FALSE); + + /* Matches *.[a-zA-Z0-9]{6} suffix of mkstemp()'s temporary files */ + ptr = strrchr (path, '.'); + if (ptr && (strspn (ptr + 1, temp_letters) == 6) && (! ptr[7])) + return TRUE; + return FALSE; +} + +static gboolean +check_prefix (const char *base, const char *tag) +{ + int len, tag_len; + + g_return_val_if_fail (base != NULL, TRUE); + g_return_val_if_fail (tag != NULL, TRUE); + + len = strlen (base); + tag_len = strlen (tag); + if ((len > tag_len) && !strncasecmp (base, tag, tag_len)) + return TRUE; + return FALSE; +} + +static gboolean +check_suffix (const char *base, const char *tag) +{ + int len, tag_len; + + g_return_val_if_fail (base != NULL, TRUE); + g_return_val_if_fail (tag != NULL, TRUE); + + len = strlen (base); + tag_len = strlen (tag); + if ((len > tag_len) && !strcasecmp (base + len - tag_len, tag)) + return TRUE; + return FALSE; +} + +gboolean +utils_should_ignore_file (const char *filename) +{ + char *base; + gboolean ignore = FALSE; + + g_return_val_if_fail (filename != NULL, TRUE); + + base = g_path_get_basename (filename); + g_return_val_if_fail (base != NULL, TRUE); + + /* Ignore files with certain patterns */ + if ( (check_prefix (base, ".") && check_suffix (base, SWP_TAG)) /* vim temporary files: .filename.swp */ + || (check_prefix (base, ".") && check_suffix (base, SWPX_TAG)) /* vim temporary files: .filename.swpx */ + || check_mkstemp_suffix (base)) /* temporary files created by mkstemp() */ + ignore = TRUE; + + g_free (base); + return ignore; +} + Index: NetworkManager-0.8.2/system-settings/plugins/keyfile/utils.h =================================================================== --- /dev/null +++ NetworkManager-0.8.2/system-settings/plugins/keyfile/utils.h @@ -0,0 +1,30 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager system settings service + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (C) Copyright 2010 Red Hat, Inc. + */ + +#ifndef _UTILS_H_ +#define _UTILS_H_ + +#include <glib.h> +#include "common.h" + +gboolean utils_should_ignore_file (const char *filename); + +#endif /* _UTILS_H_ */ + Index: NetworkManager-0.8.2/system-settings/plugins/keyfile/Makefile.in =================================================================== --- NetworkManager-0.8.2.orig/system-settings/plugins/keyfile/Makefile.in +++ NetworkManager-0.8.2/system-settings/plugins/keyfile/Makefile.in @@ -361,6 +361,8 @@ libkeyfile_io_la_SOURCES = \ writer.c \ writer.h \ errors.c \ + utils.c \ + utils.h \ common.h libkeyfile_io_la_CPPFLAGS = \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-0_10-plugins-ugly for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '11

01 Feb '11

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-ugly for openSUSE:Factory checked in at Tue Feb 1 18:25:31 CET 2011. -------- --- GNOME/gstreamer-0_10-plugins-ugly/gstreamer-0_10-plugins-ugly.changes 2011-01-16 16:09:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugins-ugly/gstreamer-0_10-plugins-ugly.changes 2011-02-01 17:05:23.000000000 +0100 @@ -1,0 +2,48 @@ +Tue Feb 1 15:53:41 UTC 2011 - davejplater(a)gmail.com + +- Update to version 0.10.16 see NEWS in documentation directory for + All news since 0.10.16 +- Upstream fixes and improvements : + *asfdemux: Handle new type of DRM'd asf files + *dvdreadsrc: fix handling of multi-angle streams + *dvdreadsrc: improve error messages on read errors + *mad: if gst_pad_alloc_buffer() returns a buffer with the wrong + size allocate a new one + *mad: support reverse playback + *mpeg2dec: convert the position to stream time before answering + to a position query + *mpeg2dec: fix position query by trusting upstream + *mpeg2dec: refactor cropping code to use libgstvideo functions + *mpeg2dec: use gst_pad_alloc_buffer() when cropping buffers + *mpegparse: re-fix flow return handling + *rmdemux: set GST_BUFFER_FLAG_DELTA_UNIT properly + *x264enc: add a note to the docs about encoder latency and queues + *x264enc: also accept YV12 input + *x264enc: Handle codec/encoder tags + *x264enc: Work around a rate control issue in libx264 + *x264: use pkg-config to locate libx264 + *x264: vbv-buf-capacity should have a minimum of 0 + *xingmux: Don't ignore WRONG_STATE and NOT_LINKED when pushing + data downstream + *539254 : [dvdreadsrc] DVDs with multiple angles switch angles + during read + *571146 : mpeg2dec: possibly uses wrong strides for 4:2:2 and + 4:4:4 YUV with unusual display width or height + *599515 : Fix dvb for DVB API 3.3 + *621465 : [x264enc] Video codec information copied incorrectly to + output + *632549 : [mpeg2dec] answers to position queries are wrong for DVDs + *632861 : [x264enc] really bad quality with tune=zerolatency + *634840 : x264: use pkg-config to locate dependencies for plugin + *635291 : x264enc: " vbv-buf-capacity " property should have + minimum value of 0 + *635461 : Crash in mad decoder when changing number of audio + output channels in Totem while media is running + *636107 : x264enc: docs should indicate specifics of using with + queues + *637093 : rmdemux: set GST_BUFFER_FLAG_DELTA_UNIT properly + *637932 : realmedia: do not use the pad buffer allocation + functions in demuxers + *639226 : [asfdemux] Doesn't handle new PlayReady DRM files + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gst-plugins-ugly-0.10.16-patched.tar.bz2 gst-plugins-ugly-0.10.16.tar.bz2 New: ---- gst-plugins-ugly-0.10.17-patched.tar.bz2 gst-plugins-ugly-0.10.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-ugly.spec ++++++ --- /var/tmp/diff_new_pack.SODxhn/_old 2011-02-01 18:24:37.000000000 +0100 +++ /var/tmp/diff_new_pack.SODxhn/_new 2011-02-01 18:24:37.000000000 +0100 @@ -24,8 +24,8 @@ %define _experimental 1 Name: gstreamer-0_10-plugins-ugly -Version: 0.10.16 -Release: 2 +Version: 0.10.17 +Release: 1 License: LGPLv2.1+ Group: Productivity/Multimedia/Other Summary: GStreamer Streaming-Media Framework Plug-Ins @@ -46,7 +46,7 @@ BuildRequires: gtk-doc BuildRequires: libcdio-devel # Broken and disabled by upstream: -#BuildRequires: libdvdnav-devel +BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel BuildRequires: libid3tag-devel BuildRequires: libsidplay1-devel ++++++ gst-plugins-ugly-0.10.16-patched.tar.bz2 -> gst-plugins-ugly-0.10.17-patched.tar.bz2 ++++++ ++++ 10642 lines of diff (skipped) ++++++ gst-plugins-ugly-0.10.16-patched.tar.bz2 -> gst-plugins-ugly-0.10.17.tar.bz2 ++++++ ++++ 29787 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-0_10-plugins-good for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '11

01 Feb '11

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-good for openSUSE:Factory checked in at Tue Feb 1 18:24:18 CET 2011. -------- --- GNOME/gstreamer-0_10-plugins-good/gstreamer-0_10-plugins-good.changes 2010-12-07 12:08:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugins-good/gstreamer-0_10-plugins-good.changes 2011-02-01 11:41:14.000000000 +0100 @@ -1,0 +2,36 @@ +Tue Feb 1 00:57:15 UTC 2011 - davejplater(a)gmail.com + +- Update to version 0.10.27: +- Upsream changes (see documentation directory NEWS for all changes) + *avidemux add workaround for buggy list size extract datetime tags + *cacasink: fix masks and strides + *deinterlace: change the default to linear + *deinterlace: avoid infinite loop draining + *deinterlace: rewrite/fix how neighboring scan lines are calculated + *flvdemux: use aac codec-data to adjust samplerate if needed + *flvmux: Fix for nellymoser codecid setting + *icydemux: Add 'StreamUrl' metadata as GST_TAG_HOMEPAGE tag + *id3demux: fix parsing of ID3v2.4 genre frames with multiple genres + *imagefreeze: pass along eos if received before buffer arrives + *jpegdec: add "max-errors" property to ignore decoding errors + *jpegdec: avoid infinite loop when resyncing; discard incomplete image + *matroskademux: add stream-format and alignment properties for h264 + *matroskademux: assume matroska if no doctype is specified + *matroskademux: increase allowed max. block size for push mode + from 10M to 15M + *matroskademux: normalize empty Cues to no Cues + *matroskamux: add support for DTS and E-AC3 audio + *matroskamux: try to write timestamps in all the outgoing buffers + *multifilesink: send stream headers in key-frame mode + *multiudpsink: add buffer-size property + *navseek: add basic support to change playback rate + *pulsemixer: Implement MIXER_FLAG_AUTO_NOTIFICATIONS + *pulsesink: flush remaining buffered samples on EOS + *pulsesink: make corking during pause synchronous; don't uncork + in _start + *pulsesink: Uncork stream while flushing the ringbuffer + *pulsesrc: add "client" property + *qtdemux: add support for fragmented mp4 + *qtdemux: add support for (E)AC-3, WMA and VC-1 audio + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gst-plugins-good-0.10.26.tar.bz2 New: ---- gst-plugins-good-0.10.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-good.spec ++++++ --- /var/tmp/diff_new_pack.R4UXWK/_old 2011-02-01 18:20:36.000000000 +0100 +++ /var/tmp/diff_new_pack.R4UXWK/_new 2011-02-01 18:20:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gstreamer-0_10-plugins-good (Version 0.10.26) +# spec file for package gstreamer-0_10-plugins-good # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -23,12 +23,14 @@ # support completely: %define ENABLE_AALIB 1 %define _name gst-plugins-good -Version: 0.10.26 +Version: 0.10.27 Release: 1 %define gst_branch 0.10 %if 0%{?ENABLE_AALIB} BuildRequires: aalib-devel %endif +# Jack moved here from plugins bad in version 0.10.27 +BuildRequires: libjack-devel BuildRequires: cairo-devel BuildRequires: check-devel BuildRequires: esound-devel @@ -49,6 +51,7 @@ BuildRequires: libshout-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel +BuildRequires: ftgl-devel BuildRequires: orc BuildRequires: python-devel BuildRequires: python-xml @@ -58,12 +61,13 @@ BuildRequires: taglib-devel BuildRequires: translation-update-upstream BuildRequires: wavpack-devel +# TODO find where process.h comes from, not kernel-devel and not wxWidgets so far. %ifarch %ix86 ppc x86_64 BuildRequires: valgrind-devel %endif License: LGPLv2.1+ Group: Productivity/Multimedia/Other -Source: %{_name}-%{version}.tar.bz2 +Source0: http://gstreamer.freedesktop.org/src/gst-plugins-good/%{_name}-%{version}.t… Url: http://gstreamer.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: GStreamer Streaming-Media Framework Plug-Ins @@ -71,14 +75,15 @@ # Name up to 10.3: Provides: gstreamer010-plugins-good = %{version} Obsoletes: gstreamer010-plugins-good < %{version} -# Generic name, never used in SuSE: +# Generic name, never used in SuSE: I wish it had been used I would have used it then I wouldn't have to keep copy pasting and actually type it. Provides: gst-plugins-good = %{version} # Pulseaudio plugin was integrated -Obsoletes: gstreamer-0_10-pulse <= 0.9.7 +Provides: gstreamer-0_10-pulse = %{version} +Obsoletes: gstreamer-0_10-pulse < %{version} %define gstreamer010_plugins_good_req %(zgrep --text "^GST.*_REQ" %{S:0} | sort -u | sed 's/GST_REQ=/gstreamer-0_10 >= /;s/GSTPB_REQ=/gstreamer-0_10-plugins-base >= /' | tr '\\n' ' ') Requires: %gstreamer010_plugins_good_req Recommends: %{name}-lang = %{version} -# qtdemux, videocrop, wavpack moved from bad (after OpenSUSE 10.2): +# qtdemux, videocrop, wavpack moved from bad (after OpenSUSE 10.2): See TODO below the header. Conflicts: gstreamer010-plugins-bad <= 0.10.4 # souphttpsrc: moved from bad (before OpenSUSE 11.1 & SLE11): Conflicts: gstreamer-0_10-plugins-bad <= 0.10.8 @@ -141,6 +146,7 @@ %lang_package %prep +chmod 0644 %{S:0} %setup -q -n %{_name}-%{version} translation-update-upstream po gst-plugins-good-0.10 @@ -205,6 +211,7 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstid3demux.so %{_libdir}/gstreamer-%{gst_branch}/libgstimagefreeze.so %{_libdir}/gstreamer-%{gst_branch}/libgstinterleave.so +%{_libdir}/gstreamer-%{gst_branch}/libgstjack.so %{_libdir}/gstreamer-%{gst_branch}/libgstjpeg.so %{_libdir}/gstreamer-%{gst_branch}/libgstlevel.so %{_libdir}/gstreamer-%{gst_branch}/libgstmatroska.so ++++++ gst-plugins-good-0.10.26.tar.bz2 -> gst-plugins-good-0.10.27.tar.bz2 ++++++ ++++ 38396 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-0_10-plugins-base for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '11

01 Feb '11

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-base for openSUSE:Factory checked in at Tue Feb 1 18:20:13 CET 2011. -------- --- GNOME/gstreamer-0_10-plugins-base/gstreamer-0_10-plugins-base.changes 2011-01-16 15:32:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugins-base/gstreamer-0_10-plugins-base.changes 2011-01-26 09:55:49.000000000 +0100 @@ -1,0 +2,43 @@ +Tue Jan 25 17:22:03 UTC 2011 - wstephenson(a)novell.com + +- Update to version 0.10.32 + + GLib requirement is now >= 2.22 + + New core elements: + - valve (moved from -bad) + - input-selector (N.B. without "select-all" property, use fsfunnel + instead) (moved from -bad) + - output-selector (with different negotiation behaviour by + default, set pad-negotiation-mode=active for previous behaviour) + (moved from -bad) + + Performance improvements for many heavily-used code paths: + GstPad, GstPoll, GstClock, GstTask, basesink, basesrc, queue2, + multiqueue + + gobject-introspection: add annotations for most core API + + clock: make sync clock wait lockfree + + fdsrc/fdsink: reenable on MSVC + + registry: fix GStatBuf definition for win32 when building against + older glib (fixes unnecessary rescanning of plugins at start-up) + + element: add a more flexible way to get request pads from elements + + multiqueue: return upon input when already eos + + object: fix creation of default name + (when creating more than 100000 elements) + + pluginloader: fix hangs on OSX + + poll: + - fixes for (p)select backend (used e.g. on OSX) + - refactor and make more lockfree; fixes for win32 and OSX + (pselect backend) + + registry: don't replace valid existing plugins by blacklisted ones + + tags: don't produce duplicated entries when merging same value twice + + basesink: + - preroll fixes for async=false case + -rework position reporting code + + basetransform: handle downstream giving a buffer with new caps + but invalid size + + See NEWS for API additions and deprecations. + + Bugs fixed: bgo#635785, bgo#638599, bgo#503592, bgo#564056, + bgo#607513, bgo#632168, bgo#632447, bgo#632557, bgo#632778, + bgo#632779, bgo#632780, bgo#633918, bgo#634965, bgo#635001, + bgo#636268, bgo#636455, bgo#637057, bgo#637300, bgo#637549, + bgo#637776, bgo#638381, bgo#638399, bgo#638900, bgo#638941. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gst-plugins-base-0.10.31.tar.bz2 New: ---- gst-plugins-base-0.10.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-base.spec ++++++ --- /var/tmp/diff_new_pack.yoIAaJ/_old 2011-02-01 18:18:55.000000000 +0100 +++ /var/tmp/diff_new_pack.yoIAaJ/_new 2011-02-01 18:18:55.000000000 +0100 @@ -20,8 +20,8 @@ Name: gstreamer-0_10-plugins-base %define _name gst-plugins-base -Version: 0.10.31 -Release: 2 +Version: 0.10.32 +Release: 1 %define gst_branch 0.10 BuildRequires: alsa-devel BuildRequires: cdparanoia-devel @@ -71,7 +71,7 @@ # For update from <= 11.1 (gstapp): Conflicts: gstreamer-0_10-plugins-bad < 0.10.10 PreReq: filesystem -%define gstreamer010_plugins_base_req %(zgrep --text "^GST.*_REQ" %{S:0} | sort -u | sed 's/GST_REQ=/gstreamer-0_10 >= /') +%define gstreamer010_plugins_base_req %(zgrep --text "^GST[_A-Z]*_REQ" %{S:0} | sort -u | sed 's/GST_REQ=/gstreamer-0_10 >= /') Requires: %gstreamer010_plugins_base_req Recommends: PackageKit-gstreamer-plugin @@ -243,6 +243,7 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstximagesink.so %{_libdir}/gstreamer-%{gst_branch}/libgstxvimagesink.so %{_libdir}/gstreamer-%{gst_branch}/libgstgdp.so +%{_libdir}/gstreamer-%{gst_branch}/libgstencodebin.so %doc %{_mandir}/man1/gst-visualise-%{gst_branch}.* %files -n gstreamer-0_10-plugin-gnomevfs ++++++ gst-plugins-base-0.10.31.tar.bz2 -> gst-plugins-base-0.10.32.tar.bz2 ++++++ ++++ 38898 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-0_10-plugins-bad for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '11

01 Feb '11

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-bad for openSUSE:Factory checked in at Tue Feb 1 18:18:34 CET 2011. -------- --- GNOME/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes 2011-01-16 15:34:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes 2011-02-01 01:38:07.000000000 +0100 @@ -1,0 +2,30 @@ +Mon Jan 31 23:48:02 UTC 2011 - davejplater(a)gmail.com + +- Update to version 0.10.21 : see documentation - NEWS for all + changes since 0.10.20 +- Upstream additions and removals : + *alsaspdif: removed alsaspdifsink element (replaced by alsasink + device=spdif) + *metadata: remove metadata plugin + *jack: jack plugin has moved to gst-plugins-good (0.10.27) + *selector: input-selector and output-selector have moved to + GStreamer core (0.10.32) + *valve: has moved to gstreamer core (0.10.32) + *camerabin2: new camerabin element (work-in-progress, experimental) + *camerabin: add "preview-source-filter","ready-for-capture", + "idle" properties + *camerabin: change "zoom" property from int to float + *camerabin: enable all conversion flags by default to make it + work out-of-the-box everywhere + *cog: improvements in colorspace and scaler; add fast paths for + colorspace conversion + *colorspace: revive element and add support for many more + pixellayouts/colorspaces + *colorspace: add support for SDTV/HDTV YUV conversions + *dvbsuboverlay: new element to overlay DVB subtitle + *interlace: new element + *jp2kdecimator: add a JPEG2000 decimator element (drop details + without reencoding) + *y4mdec: new y4mdec element + *new libgstbasecamerabinsrc-0.10.so.0 +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gst-plugins-bad-0.10.20-patched.tar.bz2 gst-plugins-bad-0.10.20.tar.bz2 New: ---- gst-plugins-bad-0.10.21-patched.tar.bz2 gst-plugins-bad-0.10.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-bad.spec ++++++ --- /var/tmp/diff_new_pack.RD9qyw/_old 2011-02-01 18:16:39.000000000 +0100 +++ /var/tmp/diff_new_pack.RD9qyw/_new 2011-02-01 18:16:39.000000000 +0100 @@ -19,15 +19,21 @@ %bcond_with divx4linux %bcond_with libmms +%bcond_with LV2 Name: gstreamer-0_10-plugins-bad # Patched code is built by default. # Use rpmbuild -D 'BUILD_ORIG 1' to build original code. # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon. %define _name gst-plugins-bad -Version: 0.10.20 -Release: 6 +Version: 0.10.21 +Release: 1 %define gst_branch 0.10 +# Please remove me when slv2 and lv2core are in factory. +%if %{with LV2} +BuildRequires: slv2-devel +BuildRequires: lv2core-devel +%endif BuildRequires: DirectFB-devel BuildRequires: SDL-devel BuildRequires: check-devel @@ -120,6 +126,9 @@ # WARNING: This is not a comment, but the real command to repack souce: #%(bash %{_sourcedir}/%{name}-patch-source.sh %{_name}-%{version}.tar.bz2) Source: %{_name}-%{version}-patched.tar.bz2 +# If the above patch source script fails due to a change in source tarball contents, you need +# to unpack the sources (this should already have happened) and examine the new plugin source for +# blacklisted content and if it's clean, edit the script and add to the allowed list in the script %endif Source1: %{name}-patch-source.sh Patch6: gstreamer010-plugins-bad-real.patch @@ -138,7 +147,10 @@ # ensure clean update after package merge. Provides: gstreamer-0_10-schroedinger = 1.0.8 Obsoletes: gstreamer-0_10-schroedinger <= 1.0.7 -%glib2_gsettings_schema_requires +%if 0%{?suse_version} >= 1140 +Requires(post): glib2-tools +Requires(postun): glib2-tools +%endif %description GStreamer is a streaming media framework based on graphs of filters @@ -174,6 +186,18 @@ %endif %endif +%package -n libgstbasecamerabinsrc-0_10-0 +License: GPLv2+ ; LGPLv2.1+ +Summary: GStreamer Streaming-Media Framework Plug-Ins +Group: Productivity/Multimedia/Other + +%description -n libgstbasecamerabinsrc-0_10-0 +GStreamer is a streaming media framework based on graphs of filters +that operate on media data. Applications using this library can do +anything media-related,from real-time sound processing to playing +videos. Its plug-in-based architecture means that new data types or +processing capabilities can be added simply by installing new plug-ins. + %package -n libgstphotography-0_10-0 License: GPLv2+ ; LGPLv2.1+ Summary: GStreamer Streaming-Media Framework Plug-Ins @@ -272,11 +296,16 @@ %clean rm -rf $RPM_BUILD_ROOT +%if 0%{?suse_version} >= 1140 + %post %glib2_gsettings_schema_post %postun %glib2_gsettings_schema_postun +%endif + +%post -n libgstbasecamerabinsrc-0_10-0 -p /sbin/ldconfig %post -n libgstphotography-0_10-0 -p /sbin/ldconfig @@ -286,6 +315,8 @@ %post -n libgstvdp-0_10-0 -p /sbin/ldconfig +%postun -n libgstbasecamerabinsrc-0_10-0 -p /sbin/ldconfig + %postun -n libgstphotography-0_10-0 -p /sbin/ldconfig %postun -n libgstbasevideo-0_10-0 -p /sbin/ldconfig @@ -295,13 +326,16 @@ %postun -n libgstvdp-0_10-0 -p /sbin/ldconfig %files +# File not found: /usr/lib64/gstreamer-0.10/libgstjack.so +# File not found: /usr/lib64/gstreamer-0.10/libgstmetadata.so +# File not found: /usr/lib64/gstreamer-0.10/libgstselector.so +# File not found: /usr/lib64/gstreamer-0.10/libgstvalve.so %defattr(-, root, root) %doc AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS %{_datadir}/glib-2.0/schemas/org.freedesktop.gstreamer-0.10.default-elements.gschema.xml %{_libdir}/gstreamer-%{gst_branch}/libgstadpcmdec.so %{_libdir}/gstreamer-%{gst_branch}/libgstadpcmenc.so %{_libdir}/gstreamer-%{gst_branch}/libgstaiff.so -%{_libdir}/gstreamer-%{gst_branch}/libgstalsaspdif.so %{_libdir}/gstreamer-%{gst_branch}/libgstapexsink.so %{_libdir}/gstreamer-%{gst_branch}/libgstasfmux.so %{_libdir}/gstreamer-%{gst_branch}/libgstassrender.so @@ -310,11 +344,13 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstbayer.so %{_libdir}/gstreamer-%{gst_branch}/libgstbz2.so %{_libdir}/gstreamer-%{gst_branch}/libgstcamerabin.so +%{_libdir}/gstreamer-%{gst_branch}/libgstcamerabin2.so %{_libdir}/gstreamer-%{gst_branch}/libgstcdaudio.so %{_libdir}/gstreamer-%{gst_branch}/libgstcdxaparse.so %{_libdir}/gstreamer-%{gst_branch}/libgstcelt.so %{_libdir}/gstreamer-%{gst_branch}/libgstcog.so %{_libdir}/gstreamer-%{gst_branch}/libgstcoloreffects.so +%{_libdir}/gstreamer-%{gst_branch}/libgstcolorspace.so %{_libdir}/gstreamer-%{gst_branch}/libgstdataurisrc.so %{_libdir}/gstreamer-%{gst_branch}/libgstdc1394.so %{_libdir}/gstreamer-%{gst_branch}/libgstdccp.so @@ -323,6 +359,7 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstdirac.so %{_libdir}/gstreamer-%{gst_branch}/libgstdtmf.so %{_libdir}/gstreamer-%{gst_branch}/libgstdvb.so +%{_libdir}/gstreamer-%{gst_branch}/libgstdvbsuboverlay.so %{_libdir}/gstreamer-%{gst_branch}/libgstfbdevsink.so %{_libdir}/gstreamer-%{gst_branch}/libgstfestival.so %{_libdir}/gstreamer-%{gst_branch}/libgstfreeze.so @@ -335,15 +372,18 @@ %{_libdir}/gstreamer-%{gst_branch}/libgsthdvparse.so %{_libdir}/gstreamer-%{gst_branch}/libgstid3tag.so %{_libdir}/gstreamer-%{gst_branch}/libgstinvtelecine.so +%{_libdir}/gstreamer-%{gst_branch}/libgstinterlace.so %{_libdir}/gstreamer-%{gst_branch}/libgstivfparse.so -%{_libdir}/gstreamer-%{gst_branch}/libgstjack.so %{_libdir}/gstreamer-%{gst_branch}/libgstjp2k.so +%{_libdir}/gstreamer-%{gst_branch}/libgstjp2kdecimator.so %{_libdir}/gstreamer-%{gst_branch}/libgstjpegformat.so %{_libdir}/gstreamer-%{gst_branch}/libgstkate.so %{_libdir}/gstreamer-%{gst_branch}/libgstladspa.so %{_libdir}/gstreamer-%{gst_branch}/libgstlegacyresample.so %{_libdir}/gstreamer-%{gst_branch}/libgstliveadder.so -%{_libdir}/gstreamer-%{gst_branch}/libgstmetadata.so +%if %{with LV2} +%{_libdir}/gstreamer-%{gst_branch}/libgstlv2.so +%endif %{_libdir}/gstreamer-%{gst_branch}/libgstmodplug.so %{_libdir}/gstreamer-%{gst_branch}/libgstmpeg4videoparse.so %{_libdir}/gstreamer-%{gst_branch}/libgstmpegdemux.so @@ -373,7 +413,6 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstsdl.so %{_libdir}/gstreamer-%{gst_branch}/libgstsdpelem.so %{_libdir}/gstreamer-%{gst_branch}/libgstsegmentclip.so -%{_libdir}/gstreamer-%{gst_branch}/libgstselector.so %{_libdir}/gstreamer-%{gst_branch}/libgstshm.so %{_libdir}/gstreamer-%{gst_branch}/libgstsndfile.so %{_libdir}/gstreamer-%{gst_branch}/libgstsoundtouch.so @@ -383,7 +422,6 @@ %{_libdir}/gstreamer-%{gst_branch}/libgsttimidity.so %{_libdir}/gstreamer-%{gst_branch}/libgsttrm.so %{_libdir}/gstreamer-%{gst_branch}/libgsttta.so -%{_libdir}/gstreamer-%{gst_branch}/libgstvalve.so %{_libdir}/gstreamer-%{gst_branch}/libgstvcdsrc.so %{_libdir}/gstreamer-%{gst_branch}/libgstvdpau.so %{_libdir}/gstreamer-%{gst_branch}/libgstvideomaxrate.so @@ -391,6 +429,7 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstvideosignal.so %{_libdir}/gstreamer-%{gst_branch}/libgstvmnc.so %{_libdir}/gstreamer-%{gst_branch}/libgstvp8.so +%{_libdir}/gstreamer-%{gst_branch}/libgsty4mdec.so %{_libdir}/gstreamer-%{gst_branch}/libresindvd.so %if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG_ADDON} @@ -423,6 +462,10 @@ %defattr(-, root, root) %{_libdir}/libgstbasevideo-0.10.so.0* +%files -n libgstbasecamerabinsrc-0_10-0 +%defattr(-, root, root) +%{_libdir}/libgstbasecamerabinsrc-0.10.so.0* + %files -n libgstsignalprocessor-0_10-0 %defattr(-, root, root) %{_libdir}/libgstsignalprocessor-0.10.so.0* ++++++ gst-plugins-bad-0.10.20-patched.tar.bz2 -> gst-plugins-bad-0.10.21-patched.tar.bz2 ++++++ ++++ 254535 lines of diff (skipped) ++++++ gst-plugins-bad-0.10.20-patched.tar.bz2 -> gst-plugins-bad-0.10.21.tar.bz2 ++++++ ++++ 340660 lines of diff (skipped) ++++++ gstreamer-0_10-plugins-bad-patch-source.sh ++++++ --- /var/tmp/diff_new_pack.RD9qyw/_old 2011-02-01 18:16:42.000000000 +0100 +++ /var/tmp/diff_new_pack.RD9qyw/_new 2011-02-01 18:16:42.000000000 +0100 @@ -27,12 +27,15 @@ autoconvert bayer camerabin +camerabin2 coloreffects +colorspace cdxaparse dataurisrc dccp debugutils dtmf +dvbsuboverlay festival freeze frei0r @@ -41,8 +44,10 @@ h264parse hdvparse id3tag +interlace invtelecine ivfparse +jp2kdecimator jpegformat legacyresample librfb @@ -75,6 +80,7 @@ videomeasure videosignal vmnc +y4m " NOT_ALLOWED=" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_6_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '11

01 Feb '11

Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Tue Feb 1 18:16:20 CET 2011. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-01-18 10:20:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-02-01 15:14:14.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Feb 1 08:14:18 UTC 2011 - mvyskocil(a)suse.cz + +- fix bnc#667313 - VUL-0: embargoed java icedtea issues +- Security updates + * RH672262, CVE-2011-0025: IcedTea jarfile signature verification bypass +- Backports + * S6687968: PNGImageReader leaks native memory through an Inflater + * S6541476, RH665355: PNG imageio plugin incorrectly handles iTXt chunk + * S6782079: PNG: reading metadata may cause OOM on truncated images +- Fixes + * PR619: Improper finalization by the plugin can crash the browser + +------------------------------------------------------------------- +Mon Jan 31 09:22:53 UTC 2011 - mvyskocil(a)suse.cz + +- fix bmo#582130 - symbol clash between moonlight and icedtea plugin + * icedtea6-1.9.4-moonlight-symbol-clash.patch +- mark cursor.properties a config + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- icedtea6-1.9.4.tar.bz2 New: ---- icedtea6-1.9.4-moonlight-symbol-clash.patch icedtea6-1.9.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.e1MqZv/_old 2011-02-01 18:15:37.000000000 +0100 +++ /var/tmp/diff_new_pack.e1MqZv/_new 2011-02-01 18:15:37.000000000 +0100 @@ -31,7 +31,7 @@ # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedteaver 1.9.4 +%define icedteaver 1.9.5 %define icedteasnapshot %{nil} %define openjdkver b20 %define openjdkdate 21_jun_2010 @@ -209,8 +209,13 @@ # PATCH-FIX-OPENSUSE: gcc 4.5 warnings Patch128: openjdk-6-src-b20-may-be-used-uninitialized.patch Patch129: openjdk-6-src-b20-array-subscript-has-type-char.patch -#PATCH-FIX-OPENSUSE: bnc#635365 +#PATCH-FIX-UPSTREAM: bnc#635365 +# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=613 Patch130: 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 +Patch131: icedtea6-1.9.4-moonlight-symbol-clash.patch # PATCH-FIX-UPSTREAM bnc#524505 Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -489,6 +494,7 @@ %patch0 -b .optflags %patch124 -p1 -b .no-return-in-non-void %patch130 -p1 -b .realpath +%patch131 -p1 -b .realpath %patch1000 -p1 cp %{SOURCE6} . @@ -535,6 +541,7 @@ quilt import ${1} ${2} quilt push } + qpatch -p0 %{PATCH104} qpatch -p0 %{PATCH107} %ifarch %ix86 @@ -1047,6 +1054,7 @@ %config(noreplace) %{_jvmdir}/%{jredir}/lib/*.properties %config(noreplace) %{_jvmdir}/%{jredir}/lib/management/jmxremote.access %config(noreplace) %{_jvmdir}/%{jredir}/lib/management/management.properties +%config(noreplace) %{_jvmdir}/%{jredir}/lib/images/cursors/cursors.properties %if %{suse_version} >= 1120 # links to the demo and sample dirs in noarch subpackages %{_jvmdir}/%{sdkdir}/demo ++++++ 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.tar.bz2 -> icedtea6-1.9.5.tar.bz2 ++++++ ++++ 5675 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0