December 2012 - openSUSE Commits - openSUSE Mailing Lists

commit openslide for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package openslide for openSUSE:Factory checked in at 2012-12-03 11:16:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openslide (Old) and /work/SRC/openSUSE:Factory/.openslide.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openslide", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/openslide/openslide.changes 2012-11-02 17:38:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openslide.new/openslide.changes 2012-12-03 11:16:48.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Dec 2 08:12:56 UTC 2012 - dmitry(a)roshchin.org + +- Update to version 3.3.2 + * Fix seams in MIRAX 2.2 slides + * Fix associated image naming in single-level Aperio slides + * Stop decoding MIRAX tiles outside requested region + * Stop decoding unneeded tiles during tile-aligned accesses + * Increase Hamamatsu VMU tile size to reduce rendering overhead + * Document performance considerations for openslide_can_open() + +------------------------------------------------------------------- Old: ---- openslide-3.3.1.tar.xz New: ---- openslide-3.3.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openslide.spec ++++++ --- /var/tmp/diff_new_pack.4z0Z5o/_old 2012-12-03 11:16:49.000000000 +0100 +++ /var/tmp/diff_new_pack.4z0Z5o/_new 2012-12-03 11:16:49.000000000 +0100 @@ -20,7 +20,7 @@ %define libname lib%{name} Name: openslide -Version: 3.3.1 +Version: 3.3.2 Release: 0 Summary: C library for reading virtual slides License: LGPL-2.1 @@ -28,6 +28,7 @@ Url: http://openslide.org/ Source0: http://github.com/downloads/openslide/openslide/%{name}-%{version}.tar.xz BuildRequires: cairo-devel +BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -85,6 +86,7 @@ %install %make_install find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +%fdupes -s doc/html/ %clean rm -rf %{buildroot} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenGTL for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package OpenGTL for openSUSE:Factory checked in at 2012-12-03 11:11:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenGTL (Old) and /work/SRC/openSUSE:Factory/.OpenGTL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "OpenGTL", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/OpenGTL/OpenGTL.changes 2012-10-03 09:21:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.OpenGTL.new/OpenGTL.changes 2012-12-03 11:11:27.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Nov 24 16:06:53 UTC 2012 - alinm.elena(a)gmail.com + +- Added patches + * llvm.patch -- correctly detect our 3.1 version of llvm + * targetData.patch -- rename from "llvm/Target/TargetData.h" to + "llvm/DataLayout.h" + +------------------------------------------------------------------- New: ---- llvm.patch targetData.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenGTL.spec ++++++ --- /var/tmp/diff_new_pack.H2MGn0/_old 2012-12-03 11:11:28.000000000 +0100 +++ /var/tmp/diff_new_pack.H2MGn0/_new 2012-12-03 11:11:28.000000000 +0100 @@ -33,6 +33,10 @@ Patch0: GTLImageIO-Extensions-Installdir.patch # PATCH-FIX-UPSTREAM ld_link_fix.patch bnc#778260 kde#304903 asterios.dramis(a)gmail.com -- Fix 'ld' not wanting to link the llvm JIT library Patch1: ld_link_fix.patch +# PATCH-FIX-OPENSUSE llvm.patch alinm.elena(a)gmail.com -- Correctly detect our 3.1 version of llvm +Patch2: llvm.patch +# PATCH-FIX-UPSTREAM targetData.patch alinm.elena(a)gmail.com -- Rename from "llvm/Target/TargetData.h" to "llvm/DataLayout.h" +Patch3: targetData.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libpng-devel @@ -136,6 +140,10 @@ %setup -q %patch0 %patch1 -p1 +%if 0%{?suse_version} > 1220 +%patch2 +%patch3 +%endif %build mkdir build ++++++ llvm.patch ++++++ --- CMakeLists.txt.old 2012-11-24 15:49:10.603213815 +0000 +++ CMakeLists.txt 2012-11-24 15:49:59.553210726 +0000 @@ -47,7 +47,7 @@ configure_file(config-endian.h.cmake ${C find_package(LLVM REQUIRED) -if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" ) ) # There is no way with MSVC to know the llvm version +if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" OR LLVM_VERSION STRGREATER "3.1") ) # There is no way with MSVC to know the llvm version message(FATAL_ERROR "LLVM 3.0 or 3.1 is required.") endif() ++++++ targetData.patch ++++++ --- OpenCTL/OpenCTL/Program.cpp.old 2012-11-24 15:58:47.600182919 +0000 +++ OpenCTL/OpenCTL/Program.cpp 2012-11-24 15:59:16.735177705 +0000 @@ -29,7 +29,7 @@ #include <llvm/PassManager.h> #include <llvm/Analysis/LoopPass.h> #include <llvm/Analysis/Verifier.h> -#include <llvm/Target/TargetData.h> +#include <llvm/DataLayout.h> #include <llvm/GlobalVariable.h> // GTLCore --- OpenGTL/GTLCore/ModuleData_p.cpp.old 2012-11-24 15:55:16.866194096 +0000 +++ OpenGTL/GTLCore/ModuleData_p.cpp 2012-11-24 15:56:03.008191694 +0000 @@ -23,7 +23,7 @@ #include <llvm/Module.h> #include <llvm/PassManager.h> -#include <llvm/Target/TargetData.h> +#include <llvm/DataLayout.h> #include <llvm/Target/TargetMachine.h> #include <llvm/Analysis/Verifier.h> #include <llvm/Transforms/Utils/Cloning.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nmap for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package nmap for openSUSE:Factory checked in at 2012-12-03 10:52:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nmap (Old) and /work/SRC/openSUSE:Factory/.nmap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nmap", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/nmap/nmap.changes 2012-07-18 17:35:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nmap.new/nmap.changes 2012-12-03 10:52:38.000000000 +0100 @@ -1,0 +2,47 @@ +Sun Dec 2 14:09:50 UTC 2012 - andreas.stieger(a)gmx.de + +- update to 6.25 + + add 373 IPv4 OS fingerprints and improve existing fingerprints + + add more than 400 service/version detection fingerprints + + integrate latest IPv6 OS submissions and corrections + + Enabled support for IPv6 traceroute using UDP, SCTP, and IPProto + (Next Header) probes. + + Scripts can now return a structured name-value table so that results + are query-able from XML output. Scripts can return a string as + before, or a table, or a table and a string. In this last case, the + table will go to XML output and the string will go to screen output. + + Ncat: Added support for Unix domain sockets. The new -U and + --unixsock options activate this mode. + + removal of Windows dependencies reduces size of source tarball + + Replaced old RPC grinder with NSE-based implementation + + Updated Nmap Scripting Engine to use Lua 5.2 + + Added 85 NSE scripts + + Added 12 new protocol libraries: + * ajp (Apache JServ Protocol) + * base32 (Base32 encoding/decoding - RFC 4648) + * bjnp (Canon BJNP printer/scanner discovery protocol) + * cassandra (Cassandra database protocol) + * eigrp (Cisco Enhanced Interior Gateway Routing Protocol) + * gps (Global Positioning System - does GPRMC NMEA decoding) + * ipp (CUPS Internet Printing Protocol) + * isns (Internet Storage Name Service) + * jdwp (Java Debug Wire Protocol) + * mobileme (a service for managing Apple/Mac devices) + * ospf (Open Shortest Path First routing protocol) + * rdp (Remote Desktop Protocol) + + added more Common Platform Enumeration (CPE) identifiers + + Scans that use OS sockets (including TCP connect scan, version + detection, and script scan) now use the SO_BINDTODEVICE sockopt on + Linux, so that the -e (select network device) option is + honored. + + [Zenmap] Host filters can now do negative matching, for example you + can use "os:!linux" to match hosts NOT detected as Linux. + + further minor improvements and bug fixes as listed in + http://nmap.org/changelog.html +- for openSUSE releases where lua 5.2 is available, build with that + library, otherwise use the library that comes with the sources +- add tests for the correct system or included libraries +- refresh nmap-4.75-nostrip.patch +- refresh su-to-zenmap.patch + +------------------------------------------------------------------- Old: ---- nmap-6.01.tar.bz2 New: ---- nmap-6.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nmap.spec ++++++ --- /var/tmp/diff_new_pack.NCLSWf/_old 2012-12-03 10:52:40.000000000 +0100 +++ /var/tmp/diff_new_pack.NCLSWf/_new 2012-12-03 10:52:40.000000000 +0100 @@ -19,23 +19,23 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%define with_system_lua 0%{?suse_version} >= 1220 + Name: nmap +BuildRequires: dos2unix +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gtk2-devel BuildRequires: libpcap-devel -%if 0%{?suse_version} > 1210 -BuildRequires: lua51-devel -%else -BuildRequires: lua-devel -%endif -BuildRequires: dos2unix -BuildRequires: fdupes BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: python-devel BuildRequires: update-desktop-files -Url: http://www.insecure.org/nmap/ -Version: 6.01 +%if %with_system_lua +BuildRequires: pkgconfig(lua) >= 5.2 +%endif +Url: http://nmap.org/ +Version: 6.25 Release: 0 Summary: Portscanner License: GPL-2.0+ @@ -164,6 +164,11 @@ export CXXFLAGS="%optflags -DOPENSSL_LOAD_CONF" %configure --with-libpcap=%{_usr} \ --with-libdnet=included \ +%if %with_system_lua + --with-liblua=%{_usr} \ +%else + --with-liblua=included \ +%endif --with-libpcre=%{_usr} %__make %{?jobs:-j%jobs} @@ -181,6 +186,25 @@ %fdupes -s %{buildroot} +%check +# retrieve list of compiled in modules +compiled_with=$("${RPM_BUILD_ROOT}%{_bindir}/nmap" -V | %__grep "Compiled with:" ) +# for the following tests, the leading space is relevant +# check features built with system libraries +[[ $compiled_with == *\ libpcre-* ]] +[[ $compiled_with == *\ libpcap-* ]] +[[ $compiled_with == *\ openssl-* ]] +# check features built with included sources +[[ $compiled_with == *\ nmap-libdnet-* ]] +# check for lua +%if %with_system_lua +[[ $compiled_with == *\ liblua-5.2* ]] +%else +# lua in nmap tarball identifies itself as "liblua-5.2.1" +[[ $compiled_with == *\ liblua-5.2.1* ]] +%endif +# + %clean %__rm -rf "%{buildroot}" ++++++ nmap-4.75-nostrip.patch ++++++ --- /var/tmp/diff_new_pack.NCLSWf/_old 2012-12-03 10:52:40.000000000 +0100 +++ /var/tmp/diff_new_pack.NCLSWf/_new 2012-12-03 10:52:40.000000000 +0100 @@ -1,8 +1,8 @@ Index: Makefile.in =================================================================== ---- Makefile.in.orig 2011-12-21 00:00:05.000000000 +0000 -+++ Makefile.in 2012-03-26 22:20:22.000000000 +0100 -@@ -252,9 +252,6 @@ my_distclean: +--- Makefile.in.orig 2012-09-13 01:17:42.000000000 +0100 ++++ Makefile.in 2012-12-02 11:47:22.000000000 +0000 +@@ -253,9 +253,6 @@ my_distclean: install-nmap: $(TARGET) $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir) $(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap ++++++ nmap-6.01.tar.bz2 -> nmap-6.25.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/nmap/nmap-6.01.tar.bz2 /work/SRC/openSUSE:Factory/.nmap.new/nmap-6.25.tar.bz2 differ: char 11, line 1 ++++++ su-to-zenmap.patch ++++++ --- /var/tmp/diff_new_pack.NCLSWf/_old 2012-12-03 10:52:40.000000000 +0100 +++ /var/tmp/diff_new_pack.NCLSWf/_new 2012-12-03 10:52:40.000000000 +0100 @@ -1,7 +1,7 @@ Index: zenmap/install_scripts/unix/su-to-zenmap.sh =================================================================== ---- zenmap/install_scripts/unix/su-to-zenmap.sh.orig 2009-05-03 05:33:50.000000000 +0100 -+++ zenmap/install_scripts/unix/su-to-zenmap.sh 2012-03-26 22:20:29.000000000 +0100 +--- zenmap/install_scripts/unix/su-to-zenmap.sh.orig 2012-08-19 21:11:06.000000000 +0100 ++++ zenmap/install_scripts/unix/su-to-zenmap.sh 2012-12-02 11:48:38.000000000 +0000 @@ -13,8 +13,8 @@ if test "$euid" = "$privid"; then $COMMAND else @@ -13,14 +13,12 @@ if test "X$KDE_FULL_SESSION" = "Xtrue" ; then if which kdesu >/dev/null 2>&1 ; then SU_TO_ROOT_X=kdesu -@@ -39,8 +39,8 @@ else +@@ -39,7 +39,7 @@ else fi fi case $SU_TO_ROOT_X in - gksu) gksu -u "$PRIV" "$COMMAND";; -- kdesu) kdesu -u "$PRIV" "$COMMAND";; + gnomesu) gnomesu -u "$PRIV" -c "$COMMAND";; -+ kdesu) kdesu -u "$PRIV" -c "$COMMAND";; - kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";; + kdesu) kdesu -u "$PRIV" -c "$COMMAND";; + kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" -c "$COMMAND";; ktsuss) ktsuss -u "$PRIV" "$COMMAND";; - # As a last resort, open a new xterm use sudo/su -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaThunderbird for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2012-12-03 10:44:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2012-11-22 14:02:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2012-12-03 10:44:02.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 26 11:10:11 UTC 2012 - wr(a)rosenauer.org + +- fix KDE integration for file dialogs +- fix some rpmlint warnings (mkdir.done files) +- build on SLE11 + * mozilla-gcc43-enums.patch + * mozilla-gcc43-template_hacks.patch + * mozilla-gcc43-templates_instantiation.patch + +------------------------------------------------------------------- New: ---- mozilla-gcc43-enums.patch mozilla-gcc43-template_hacks.patch mozilla-gcc43-templates_instantiation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.5j2ShK/_old 2012-12-03 10:44:07.000000000 +0100 +++ /var/tmp/diff_new_pack.5j2ShK/_new 2012-12-03 10:44:07.000000000 +0100 @@ -76,6 +76,10 @@ Patch4: mozilla-kde.patch Patch5: mozilla-arm-disable-edsp.patch Patch7: mozilla-ppc.patch +# SLE11 patches +Patch10: mozilla-gcc43-enums.patch +Patch11: mozilla-gcc43-template_hacks.patch +Patch12: mozilla-gcc43-templates_instantiation.patch # Thunderbird/mail Patch20: tb-ssldap.patch Patch21: tb-develdirs.patch @@ -203,6 +207,12 @@ %endif %patch5 -p1 %patch7 -p1 +# SLE patches +%if %suse_version <= 1110 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%endif popd # comm-central patches %patch20 -p1 @@ -431,6 +441,8 @@ -name "*.properties" -o \ -name "*.dtd" -o \ -name "*.css" | xargs chmod a-x +# remove mkdir.done files from installed base +find $RPM_BUILD_ROOT%{progdir} -name ".mkdir.done" | xargs rm # for size in 16 22 24 32 48 256; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/ ++++++ mozilla-gcc43-enums.patch ++++++ # HG changeset patch # Parent 6d0e0f7dc4cf04f1d08f8b4f8e9312ac05928608 remove trailing commas in enum definitions as these are unpalatable for gcc (4.3.4) in pedantic mode diff --git a/media/webrtc/trunk/src/common_types.h b/media/webrtc/trunk/src/common_types.h --- a/media/webrtc/trunk/src/common_types.h +++ b/media/webrtc/trunk/src/common_types.h @@ -342,17 +342,17 @@ enum TelephoneEventDetectionMethods enum NsModes // type of Noise Suppression { kNsUnchanged = 0, // previously set mode kNsDefault, // platform default kNsConference, // conferencing default kNsLowSuppression, // lowest suppression kNsModerateSuppression, kNsHighSuppression, - kNsVeryHighSuppression, // highest suppression + kNsVeryHighSuppression // highest suppression }; enum AgcModes // type of Automatic Gain Control { kAgcUnchanged = 0, // previously set mode kAgcDefault, // platform default // adaptive mode for use when analog volume control exists (e.g. for // PC softphone) @@ -367,17 +367,17 @@ enum AgcModes // type o // EC modes enum EcModes // type of Echo Control { kEcUnchanged = 0, // previously set mode kEcDefault, // platform default kEcConference, // conferencing default (aggressive AEC) kEcAec, // Acoustic Echo Cancellation - kEcAecm, // AEC mobile + kEcAecm // AEC mobile }; // AECM modes enum AecmModes // mode of AECM { kAecmQuietEarpieceOrHeadset = 0, // Quiet earpiece or headset use kAecmEarpiece, // most earpiece use @@ -416,43 +416,43 @@ enum NetEqModes // NetEQ pla // Optimized trade-off between low delay and jitter robustness for two-way // communication. kNetEqDefault = 0, // Improved jitter robustness at the cost of increased delay. Can be // used in one-way communication. kNetEqStreaming = 1, // Optimzed for decodability of fax signals rather than for perceived audio // quality. - kNetEqFax = 2, + kNetEqFax = 2 }; enum NetEqBgnModes // NetEQ Background Noise (BGN) configurations { // BGN is always on and will be generated when the incoming RTP stream // stops (default). kBgnOn = 0, // The BGN is faded to zero (complete silence) after a few seconds. kBgnFade = 1, // BGN is not used at all. Silence is produced after speech extrapolation // has faded. - kBgnOff = 2, + kBgnOff = 2 }; enum OnHoldModes // On Hold direction { kHoldSendAndPlay = 0, // Put both sending and playing in on-hold state. kHoldSendOnly, // Put only sending in on-hold state. kHoldPlayOnly // Put only playing in on-hold state. }; enum AmrMode { kRfc3267BwEfficient = 0, kRfc3267OctetAligned = 1, - kRfc3267FileStorage = 2, + kRfc3267FileStorage = 2 }; // ================================================================== // Video specific types // ================================================================== // Raw video types enum RawVideoType ++++++ mozilla-gcc43-template_hacks.patch ++++++ # HG changeset patch # Parent 993c5b5a44ca18c5273b74c75704b418c2477d28 bmo#783505 - bump gcc version required for building without template hacks diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp --- a/js/src/jstypedarray.cpp +++ b/js/src/jstypedarray.cpp @@ -1404,17 +1404,17 @@ class TypedArrayTemplate // retrieves a given Value, probably from a slot on the object. template<Value ValueGetter(JSObject *obj)> static JSBool Getter(JSContext *cx, unsigned argc, Value *vp) { CallArgs args = CallArgsFromVp(argc, vp); // FIXME: Hack to keep us building with gcc 4.2. Remove this once we // drop support for gcc 4.2. See bug 783505 for the details. -#if defined(__GNUC__) && __GNUC_MINOR__ <= 2 +#if defined(__GNUC__) && __GNUC_MINOR__ <= 3 return CallNonGenericMethod(cx, IsThisClass, GetterImpl<ValueGetter>, args); #else return CallNonGenericMethod<ThisTypeArray::IsThisClass, ThisTypeArray::GetterImpl<ValueGetter> >(cx, args); #endif } // Define an accessor for a read-only property that invokes a native getter ++++++ mozilla-gcc43-templates_instantiation.patch ++++++ # HG changeset patch # Parent 2e78665a1ab70f4dc3884965428bda14da684ef6 bmo#732340 - explicitly instantiate templates diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc --- a/gfx/harfbuzz/src/hb-ot-layout.cc +++ b/gfx/harfbuzz/src/hb-ot-layout.cc @@ -479,8 +479,12 @@ hb_ot_layout_position_lookup (hb_font_t return hb_ot_layout_from_face (font->face)->gpos->position_lookup (&c, lookup_index); } void hb_ot_layout_position_finish (hb_font_t *font, hb_buffer_t *buffer, hb_bool_t zero_width_attached_marks) { GPOS::position_finish (font, buffer, zero_width_attached_marks); } + +template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const; +template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const; +template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const; ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.5j2ShK/_old 2012-12-03 10:44:07.000000000 +0100 +++ /var/tmp/diff_new_pack.5j2ShK/_new 2012-12-03 10:44:07.000000000 +0100 @@ -3106,27 +3106,40 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -369,16 +373,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat - return NS_ERROR_FAILURE; - } +@@ -388,16 +392,32 @@ nsFilePicker::Show(int16_t *aReturn) NS_IMETHODIMP - nsFilePicker::Show(int16_t *aReturn) + nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) { - NS_ENSURE_ARG_POINTER(aReturn); + // Can't show two dialogs concurrently with the same filepicker + if (mRunning) + return NS_ERROR_NOT_AVAILABLE; -+ if( nsKDEUtils::kdeSupport()) -+ return kdeFileDialog(aReturn); ++ // KDE file picker is not handled via callback ++ if( nsKDEUtils::kdeSupport()) { ++ int16_t result; ++ mCallback = aCallback; ++ mRunning = true; ++ kdeFileDialog(&result); ++ if (mCallback) { ++ mCallback->Done(result); ++ mCallback = nullptr; ++ } else { ++ mResult = result; ++ } ++ mRunning = false; ++ return NS_OK; ++ } + - nsresult rv = Open(nullptr); - if (NS_FAILED(rv)) - return rv; + nsXPIDLCString title; + title.Adopt(ToNewUTF8String(mTitle)); - while (mRunning) { - g_main_context_iteration(nullptr, TRUE); - } + GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget); -@@ -587,8 +594,235 @@ nsFilePicker::Done(GtkWidget* file_choos + GtkFileChooserAction action = GetGtkFileChooserAction(mMode); + const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) + ? GTK_STOCK_SAVE : GTK_STOCK_OPEN; +@@ -587,8 +607,235 @@ nsFilePicker::Done(GtkWidget* file_choos if (mCallback) { mCallback->Done(result); mCallback = nullptr; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2012-12-03 10:41:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox", Maintainer is "bnc-team-mozilla(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2012-11-22 16:46:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2012-12-03 10:41:09.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Nov 29 19:56:51 UTC 2012 - wr(a)rosenauer.org + +- update to Firefox 17.0.1 + * revert some useragent changes introduced in 17.0 + * leaving private browsing with social enabled doesn't reset all + social components (bmo#815042) +- fix KDE integration for file dialogs + +------------------------------------------------------------------- Old: ---- firefox-17.0-source.tar.bz2 l10n-17.0.tar.bz2 New: ---- firefox-17.0.1-source.tar.bz2 l10n-17.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.5p8UM5/_old 2012-12-03 10:41:26.000000000 +0100 +++ /var/tmp/diff_new_pack.5p8UM5/_new 2012-12-03 10:41:26.000000000 +0100 @@ -18,7 +18,7 @@ %define major 17 -%define mainver %major.0 +%define mainver %major.0.1 %define update_channel release Name: MozillaFirefox @@ -54,7 +54,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2012111600 +%define releasedate 2012112800 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.5p8UM5/_old 2012-12-03 10:41:26.000000000 +0100 +++ /var/tmp/diff_new_pack.5p8UM5/_new 2012-12-03 10:41:26.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_17_0_RELEASE" -VERSION="17.0" +RELEASE_TAG="FIREFOX_17_0_1_RELEASE" +VERSION="17.0.1" # mozilla echo "cloning $BRANCH..." ++++++ firefox-17.0-source.tar.bz2 -> firefox-17.0.1-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-17.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-17.0.1-source.tar.bz2 differ: char 11, line 1 ++++++ l10n-17.0.tar.bz2 -> l10n-17.0.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-17.0.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-17.0.1.tar.bz2 differ: char 11, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.5p8UM5/_old 2012-12-03 10:41:26.000000000 +0100 +++ /var/tmp/diff_new_pack.5p8UM5/_new 2012-12-03 10:41:26.000000000 +0100 @@ -3106,27 +3106,40 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -369,16 +373,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat - return NS_ERROR_FAILURE; - } +@@ -388,16 +392,32 @@ nsFilePicker::Show(int16_t *aReturn) NS_IMETHODIMP - nsFilePicker::Show(int16_t *aReturn) + nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) { - NS_ENSURE_ARG_POINTER(aReturn); + // Can't show two dialogs concurrently with the same filepicker + if (mRunning) + return NS_ERROR_NOT_AVAILABLE; -+ if( nsKDEUtils::kdeSupport()) -+ return kdeFileDialog(aReturn); ++ // KDE file picker is not handled via callback ++ if( nsKDEUtils::kdeSupport()) { ++ int16_t result; ++ mCallback = aCallback; ++ mRunning = true; ++ kdeFileDialog(&result); ++ if (mCallback) { ++ mCallback->Done(result); ++ mCallback = nullptr; ++ } else { ++ mResult = result; ++ } ++ mRunning = false; ++ return NS_OK; ++ } + - nsresult rv = Open(nullptr); - if (NS_FAILED(rv)) - return rv; + nsXPIDLCString title; + title.Adopt(ToNewUTF8String(mTitle)); - while (mRunning) { - g_main_context_iteration(nullptr, TRUE); - } + GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget); -@@ -587,8 +594,235 @@ nsFilePicker::Done(GtkWidget* file_choos + GtkFileChooserAction action = GetGtkFileChooserAction(mMode); + const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) + ? GTK_STOCK_SAVE : GTK_STOCK_OPEN; +@@ -587,8 +607,235 @@ nsFilePicker::Done(GtkWidget* file_choos if (mCallback) { mCallback->Done(result); mCallback = nullptr; ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.5p8UM5/_old 2012-12-03 10:41:26.000000000 +0100 +++ /var/tmp/diff_new_pack.5p8UM5/_new 2012-12-03 10:41:26.000000000 +0100 @@ -1,2 +1,2 @@ -REV=0af23f8db35d +REV=c23c45132139 REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit module-init-tools for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package module-init-tools for openSUSE:Factory checked in at 2012-12-03 10:30:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/module-init-tools (Old) and /work/SRC/openSUSE:Factory/.module-init-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "module-init-tools", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/module-init-tools/module-init-tools.changes 2012-09-26 16:22:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.module-init-tools.new/module-init-tools.changes 2012-12-03 10:30:34.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 14 18:44:10 UTC 2012 - jengelh(a)inai.de + +- Move m-i-t independent files to suse-module-tools, so that + kmod-compat can be installed in a system. +- Remove redundant %clean section + +------------------------------------------------------------------- Old: ---- 10-unsupported-modules.conf README.SUSE depmod-00-system.conf driver-check.sh modprobe.conf.tar.bz2 weak-modules weak-modules2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ module-init-tools.spec ++++++ --- /var/tmp/diff_new_pack.CBXgt3/_old 2012-12-03 10:30:35.000000000 +0100 +++ /var/tmp/diff_new_pack.CBXgt3/_new 2012-12-03 10:30:35.000000000 +0100 @@ -40,18 +40,12 @@ Group: System/Kernel Url: http://www.kerneltools.org/ Source0: http://www.kernel.org/pub/linux/utils/kernel/%{name}/%{name}-%{version}.tar… -Source1: README.SUSE -Source2: modprobe.conf.tar.bz2 -Source3: depmod-00-system.conf -Source4: 10-unsupported-modules.conf -Source5: weak-modules -Source6: weak-modules2 -Source7: driver-check.sh # Patch1: module-init-tools-upstream.diff Patch2: module-init-tools-suse.diff # PATCH-FIX-UPSTREAM module-init-tools-fix-nfs-local.diff [bnc#781737] Patch3: module-init-tools-fix-nfs-local.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: suse-module-tools %description Utilities for loading kernel modules. Included are 'insmod', 'lsmod', @@ -70,7 +64,7 @@ Jon Masters <jcm(a)jonmasters.org> %prep -%setup -q -a2 +%setup -q # patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -87,99 +81,15 @@ %install make DESTDIR=$RPM_BUILD_ROOT install -install -m644 %_sourcedir/README.SUSE . ln -sf /bin/lsmod $RPM_BUILD_ROOT/sbin/lsmod -# -# now assemble the parts for modprobe.conf -# -cd modprobe.conf -cp modprobe.conf.common 00-system.conf -if [ -f modprobe.conf.$RPM_ARCH ] ; then - cat modprobe.conf.$RPM_ARCH >> 00-system.conf -fi -install -d -m 755 $RPM_BUILD_ROOT/etc/modprobe.d -install -m644 %_sourcedir/10-unsupported-modules.conf \ - $RPM_BUILD_ROOT/etc/modprobe.d/ -install -m644 00-system.conf $RPM_BUILD_ROOT/etc/modprobe.d/ -install -m644 modprobe.conf.local $RPM_BUILD_ROOT/etc/modprobe.d/99-local.conf -install -d -m 755 $RPM_BUILD_ROOT/etc/depmod.d -install -m 644 %_sourcedir/depmod-00-system.conf \ - $RPM_BUILD_ROOT/etc/depmod.d/00-system.conf -install -d -m 755 $RPM_BUILD_ROOT/usr/lib/%name +#install -d -m 755 $RPM_BUILD_ROOT/usr/lib/%name #install -m 755 modindex $RPM_BUILD_ROOT/usr/lib/%name/ -install -m 755 %_sourcedir/weak-modules{,2} $RPM_BUILD_ROOT/usr/lib/%name/ -install -m 755 %_sourcedir/driver-check.sh $RPM_BUILD_ROOT/usr/lib/%name/ - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -test_allow_on_install() -{ - # configure handling of unsupported modules - # default is to allow them - allow=1 - # if the obsolete LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY variable is - # set to no, don't allow (this was used in SLES 9 and 10) - if test -e /etc/sysconfig/hardware/config; then - . /etc/sysconfig/hardware/config - if test "x$LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY" = "xno"; then - allow=0 - fi - # obsolete - rm /etc/sysconfig/hardware/config - fi - # don't change the setting during upgrade - if test "$1" != 1; then - return - fi - # on SLES, the default is not to allow unsupported modules - if grep -qs "Enterprise Server" /etc/SuSE-release; then - allow=0 - else - return - fi - # unless the admin passed "oem-modules=1" to the kernel during install - if grep -qs '\<oem-modules=1\>' /proc/cmdline; then - allow=1 - return - fi - # or if the installer already loaded some unsupported modules - # (see TAINT_NO_SUPPORT in /usr/src/linux/include/linux/kernel.h) - tainted=$(cat /proc/sys/kernel/tainted 2>/dev/null || echo 0) - if test $((tainted & (1<<30))) != 0; then - allow=1 - return - fi -} -# upgrade from old locations -if test -e /etc/modprobe.d/unsupported-modules; then - mv -f /etc/modprobe.d/unsupported-modules \ - /etc/modprobe.d/10-unsupported-modules.conf -fi -if test -e /etc/modprobe.conf.local; then - mv -f /etc/modprobe.conf.local \ - /etc/modprobe.d/99-local.conf -fi -test_allow_on_install "$@" -if test "$allow" = "0"; then - sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \ - /etc/modprobe.d/10-unsupported-modules.conf -fi %files %defattr(-,root,root) -%dir /etc/modprobe.d -%config /etc/modprobe.d/00-system.conf -%config(noreplace) /etc/modprobe.d/10-unsupported-modules.conf -%config(noreplace) /etc/modprobe.d/99-local.conf -%dir /etc/depmod.d -%config /etc/depmod.d/00-system.conf %doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO -%doc README.SUSE %doc %{_mandir}/man?/* /bin/* /sbin/* -/usr/lib/%name %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ltrace for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package ltrace for openSUSE:Factory checked in at 2012-12-03 10:21:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ltrace (Old) and /work/SRC/openSUSE:Factory/.ltrace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ltrace", Maintainer is "PBaudis(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ltrace/ltrace.changes 2012-09-15 17:28:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ltrace.new/ltrace.changes 2012-12-03 10:21:50.000000000 +0100 @@ -1,0 +2,76 @@ +Fri Nov 30 13:51:04 UTC 2012 - schwab(a)linux-m68k.org + +- Update to 0.7.1 + * Version 0.7.1 + ** Bugfixes + *** ltrace.conf.5 is now installed to man5 as it should be + *** [PowerPC] A header file necessary for building is now shipped + *** [MIPS] Work around duplicate symbol request bug + *** Detect VDSO entry in r_debug linkmap with non-empty name + *** Temporary files are wiped properly after the test suite has been run + *** Parsing typedefs with common prefix now works as it should + ** Cofiguration Files + *** The following prototypes in ltrace.conf were added or updated + *** Duplicate typedefs are now guarded against + *** It's now possible to define recursive structures + *** New lens "bitvec" is available + *** Octal lens renamed to "oct" + *** The hex lens can now format floating point arguments + + * Version 0.7.0 + ** Tracing + *** Full support for tracing multi-threaded processes + *** Support for tracing inter-library calls + *** Better support for parameter passing ("fetch backend") + *** Awareness of deny_ptrace SELinux boolean + *** Limited support for tracing returns from tail call functions + *** -e, -x and -l selectors now allow using globs and regular expressions + *** -g command line option dropped + *** Test suite can now be run under valgrind + *** [ppc] Support both BSS and secure PLTs for 32-bit processes + *** [mips] Implement software singlestepping + *** [mips] Add support for CPIC main programs + *** Support tracing PIE binaries + ** Configuration Files + *** New abstraction: parameter pack + *** New expression: zero + *** Lenses: change the way that underlying type is rendered + *** Misspelling of "int" as "itn" temporarily accepted, but deprecated + *** Using void as top-level function argument now deprecated + *** Using void to hide one argument is now obsolete + ** Documentation + *** New manual page ltrace.conf(5) + *** README, INSTALL brought up to date + *** New file CREDITS with a list of contributors + ** Bugfixes + *** Fix detaching from a process + *** Argument to -n is now checked for validity + *** Fix tracing across exec in a stripped binary + *** [x86] ORIG_RAX/ORIG_EAX may not contain original syscall number + *** [ppc] Fix races in tracing -e events in 64-bit processes + *** [ppc] Allow stepping over lwarx instruction + ** Known bugs + *** [arm] Tracing is not supported at all on ARM + + * Version 0.6.0 + + ** General Features + *** Use autotools for building + *** New option -b: disables output of signals received by the tracee + *** New option -w: print stack trace of events + *** Support tracing of symbols from libraries opened with dlopen + ** Architecture-specific Changes + *** Various fixes for MIPS and PowerPC + *** Support for ARM Thumb mode + *** Implement fetching of 5th and further function arguments on s390 + *** Support fork/exec syscalls on 31-bit s390 + *** Support for float and double arguments on x86_64 + *** Fixes for return arguments (after '+') in nested calls on x86_64 + +- removed upstreamed patches: + ltrace.ppc.patch + ltrace.s390-more-arguments.patch + ltrace.demangle-lib.cstdlib.patch + +- ltrace.vdso.patch: allow more VDSO names. +------------------------------------------------------------------- Old: ---- ltrace-0.5.3.tar.bz2 ltrace.demangle-lib.cstdlib.patch ltrace.ppc.patch ltrace.s390-more-arguments.patch New: ---- ltrace-0.7.1.tar.bz2 ltrace.vdso.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ltrace.spec ++++++ --- /var/tmp/diff_new_pack.bBoSn2/_old 2012-12-03 10:21:52.000000000 +0100 +++ /var/tmp/diff_new_pack.bBoSn2/_new 2012-12-03 10:21:52.000000000 +0100 @@ -30,16 +30,14 @@ Summary: Trace the Library and System Calls a Program Makes License: GPL-2.0+ Group: Development/Tools/Debuggers -Version: 0.5.3 +Version: 0.7.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 s390 s390x ppc ppc64 armv4l x86_64 alpha ia64 +ExclusiveArch: %ix86 s390 s390x ppc ppc64 %arm x86_64 alpha ia64 Prefix: /usr Source: ltrace-%{version}.tar.bz2 Source2: baselibs.conf -Patch1: ltrace.s390-more-arguments.patch -Patch2: ltrace.demangle-lib.cstdlib.patch -Patch3: ltrace.ppc.patch +Patch1: ltrace.vdso.patch %description Ltrace is a program that runs the specified command until it exits. It @@ -62,14 +60,13 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build -export CFLAGS="%{optflags} -W -Wall" +export CFLAGS="%{optflags} -Wall" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=%{_mandir} \ + --disable-shared \ %ifarch armv4l --build=arm-suse-linux %else @@ -103,9 +100,10 @@ %files %defattr(-,root,root) -%doc COPYING README ChangeLog %{_target_cpu}-testresults.txt testsuite/%{_target_cpu}-testrun.sum +%doc COPYING README %{_target_cpu}-testresults.txt testsuite/%{_target_cpu}-testrun.sum %{_bindir}/ltrace %{_mandir}/man1/ltrace.1.gz +%{_mandir}/man5/ltrace.conf.5.gz %config /etc/ltrace.conf %changelog ++++++ ltrace-0.5.3.tar.bz2 -> ltrace-0.7.1.tar.bz2 ++++++ ++++ 88084 lines of diff (skipped) ++++++ ltrace.vdso.patch ++++++ --- a/sysdeps/linux-gnu/proc.c +++ b/sysdeps/linux-gnu/proc.c @@ -521,6 +521,8 @@ crawl_linkmap(struct Process *proc, struct lt_r_debug_64 *dbg) * kludge is about the best that we can do. */ if (*lib_name == 0 || strcmp(lib_name, "linux-vdso.so.1") == 0 + || strcmp(lib_name, "linux-vdso32.so.1") == 0 + || strcmp(lib_name, "linux-vdso64.so.1") == 0 || strcmp(lib_name, "linux-gate.so.1") == 0) continue; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightspark for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package lightspark for openSUSE:Factory checked in at 2012-12-03 10:02:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightspark (Old) and /work/SRC/openSUSE:Factory/.lightspark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightspark", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightspark/lightspark.changes 2012-11-02 17:37:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lightspark.new/lightspark.changes 2012-12-03 10:02:06.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 30 10:45:57 UTC 2012 - reddwarf(a)opensuse.org + +- Add lightspark-0.7.0-llvm32.patch to fix build with LLVM 3.2 + +------------------------------------------------------------------- New: ---- lightspark-0.7.0-llvm32.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightspark.spec ++++++ --- /var/tmp/diff_new_pack.QdAT3v/_old 2012-12-03 10:02:07.000000000 +0100 +++ /var/tmp/diff_new_pack.QdAT3v/_new 2012-12-03 10:02:07.000000000 +0100 @@ -31,6 +31,8 @@ Patch0: lightspark-0.5.7-underlinking.patch # PATCH-FIX-UPSTREAM lightspark-0.7.0-no_glu.patch lp#1073536 reddwarf(a)opensuse.org -- Avoid the need for GLU Patch1: lightspark-0.7.0-no_glu.patch +# PATCH-FIX-UPSTREAM lightspark-0.7.0-llvm32.patch lp#1080123 reddwarf(a)opensuse.org -- Fix build with LLVM 3.2. Took from upstream BZR. +Patch2: lightspark-0.7.0-llvm32.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -85,6 +87,7 @@ %setup -q %patch0 %patch1 +%patch2 %build export CFLAGS='%{optflags}' ++++++ lightspark-0.7.0-llvm32.patch ++++++ === modified file 'conf/FindLLVM.cmake' Index: conf/FindLLVM.cmake =================================================================== --- conf/FindLLVM.cmake.orig +++ conf/FindLLVM.cmake @@ -156,6 +156,23 @@ else (LLVM_INCLUDE_DIR) IF(HAVE_SUPPORT_TARGETSELECT_H) ADD_DEFINITIONS(-DHAVE_SUPPORT_TARGETSELECT_H) ENDIF(HAVE_SUPPORT_TARGETSELECT_H) + + set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) + set(CMAKE_REQUIRED_DEFINITIONS -D__STDC_LIMIT_MACROS=1 -D__STDC_CONSTANT_MACROS=1) + check_include_file_cxx("llvm/IRBuilder.h" HAVE_IRBUILDER_H) + unset(CMAKE_REQUIRED_INCLUDES) + MESSAGE(STATUS "HAVE_IRBUILDER_H: " ${HAVE_IRBUILDER_H}) + IF(HAVE_IRBUILDER_H) + ADD_DEFINITIONS(-DHAVE_IRBUILDER_H) + ENDIF(HAVE_IRBUILDER_H) + + set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) + check_include_file_cxx("llvm/DataLayout.h" HAVE_DATALAYOUT_H) + unset(CMAKE_REQUIRED_INCLUDES) + MESSAGE(STATUS "HAVE_DATALAYOUT_H: " ${HAVE_DATALAYOUT_H}) + IF(HAVE_DATALAYOUT_H) + ADD_DEFINITIONS(-DHAVE_DATALAYOUT_H) + ENDIF(HAVE_DATALAYOUT_H) exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags OUTPUT_VARIABLE LLVM_COMPILE_FLAGS ) MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS}) Index: src/scripting/abc.cpp =================================================================== --- src/scripting/abc.cpp.orig +++ src/scripting/abc.cpp @@ -28,7 +28,11 @@ #include <llvm/ExecutionEngine/JIT.h> #include <llvm/PassManager.h> #include <llvm/LLVMContext.h> -#include <llvm/Target/TargetData.h> +#ifdef HAVE_DATALAYOUT_H +# include <llvm/DataLayout.h> +#else +# include <llvm/Target/TargetData.h> +#endif #ifdef HAVE_SUPPORT_TARGETSELECT_H #include <llvm/Support/TargetSelect.h> #else @@ -1454,7 +1458,11 @@ void ABCVm::Run(ABCVm* th) assert_and_throw(th->ex); th->FPM=new llvm::FunctionPassManager(th->module); +#ifdef HAVE_DATALAYOUT_H + th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout())); +#else th->FPM->add(new llvm::TargetData(*th->ex->getTargetData())); +#endif #ifdef EXPENSIVE_DEBUG //This is pretty heavy, do not enable in release th->FPM->add(llvm::createVerifierPass()); Index: src/scripting/abc_codesynt.cpp =================================================================== --- src/scripting/abc_codesynt.cpp.orig +++ src/scripting/abc_codesynt.cpp @@ -29,10 +29,18 @@ #include <llvm/DerivedTypes.h> #include <llvm/ExecutionEngine/ExecutionEngine.h> #include <llvm/PassManager.h> -#include <llvm/Constants.h> -#include <llvm/Support/IRBuilder.h> +#include <llvm/Constants.h> +#ifdef HAVE_IRBUILDER_H +# include <llvm/IRBuilder.h> +#else +# include <llvm/Support/IRBuilder.h> +#endif #include <llvm/LLVMContext.h> -#include <llvm/Target/TargetData.h> +#ifdef HAVE_DATALAYOUT_H +# include <llvm/DataLayout.h> +#else +# include <llvm/Target/TargetData.h> +#endif #include <sstream> #include "scripting/abc.h" #include "swftypes.h" @@ -271,7 +279,11 @@ void ABCVm::registerFunctions() llvm::FunctionType* FT=NULL; //Create types +#ifdef HAVE_DATALAYOUT_H + ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context()); +#else ptr_type=ex->getTargetData()->getIntPtrType(llvm_context()); +#endif //Pointer to 8 bit type, needed for pointer arithmetic voidptr_type=llvm::IntegerType::get(getVm()->llvm_context(),8)->getPointerTo(); number_type=llvm::Type::getDoubleTy(llvm_context()); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libzypp for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2012-12-03 09:55:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp", Maintainer is "ma(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2012-11-14 16:52:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2012-12-03 09:55:11.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 22 01:14:42 CET 2012 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Nov 18 01:13:44 CET 2012 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.pjxtG2/_old 2012-12-03 09:55:12.000000000 +0100 +++ /var/tmp/diff_new_pack.pjxtG2/_new 2012-12-03 09:55:12.000000000 +0100 @@ -73,7 +73,7 @@ BuildRequires: pkg-config %endif -BuildRequires: libsolv-devel +BuildRequires: libsolv-devel >= 0.2.1 %if 0%{?suse_version} >= 1100 %requires_eq libsolv-tools %else ++++++ libzypp-12.4.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/doc/autoinclude/UserData.doc new/libzypp-12.4.0/doc/autoinclude/UserData.doc --- old/libzypp-12.4.0/doc/autoinclude/UserData.doc 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/doc/autoinclude/UserData.doc 2012-11-23 18:11:08.000000000 +0100 @@ -12,4 +12,6 @@ \li The user data string will also be passed to commit plugins, so they can make use of it. The btrfs e.g would be able to tag created snapshots with this string. \see \ref plugin-commit +\li The user data string will appear on each histoy line logging package or repository related events (install, delete, add, modify). \see \ref zypp::HistoryLog and zypp::parser::HistoryLogReader + */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/doc/autoinclude/g_ZyppHistory.doc new/libzypp-12.4.0/doc/autoinclude/g_ZyppHistory.doc --- old/libzypp-12.4.0/doc/autoinclude/g_ZyppHistory.doc 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-12.4.0/doc/autoinclude/g_ZyppHistory.doc 2012-11-23 18:11:08.000000000 +0100 @@ -0,0 +1,89 @@ +/** \defgroup g_ZyppHistory Libzypp History File + +Log important events like installation/deletion of packages and repositories. + + +\section g_ZyppHistory_Location Location + +The default location is \c /var/log/zypp/history. This can be changed via \c history.logfile key in \c /etc/zypp/zypp.conf. + + +\section g_ZyppHistory_Format Format + +\li CSV file with pipe character (|) as the value separator +\li one event per line +\li different actions have different set of values (columns), see the tables below +\li lines starting with # are treated as comments + +\see \ref zypp-userdata + +\subsection g_ZyppHistory_Format_Colummn Action Columns + +\subsubsection g_ZyppHistory_Format_Colummn_Install Install +A package has been installed. +\li \b 1 timestamp +\li \b 2 action ID (\c "install") +\li \b 3 package name +\li \b 4 package epoch:version-release +\li \b 5 package architecture +\li \b 6 requested by (user@hostname, pid:appname, or empty (solver)) +\li \b 7 repository alias +\li \b 8 package checksum +\li \b 9 userdata/transactionId + +\subsubsection g_ZyppHistory_Format_Colummn_Remove Remove +A package has been removed. +\li \b 1 timestamp +\li \b 2 action ID (\c "remove") +\li \b 3 package name +\li \b 4 package epoch:version-release +\li \b 5 package architecture +\li \b 6 requested by (user@hostname, pid:appname, or empty (solver)) +\li \b 7 userdata/transactionId + +\subsubsection g_ZyppHistory_Format_Colummn_Radd Radd +A repository has been added. +\li \b 1 timestamp +\li \b 2 action ID (\c "radd") +\li \b 3 repository alias +\li \b 4 primary URL +\li \b 5 userdata/transactionId + +\subsubsection g_ZyppHistory_Format_Colummn_Rremove Rremove +A repository has been removed. +\li \b 1 timestamp +\li \b 2 action ID (\c "rremove") +\li \b 3 repository alias +\li \b 4 userdata/transactionId + +\subsubsection g_ZyppHistory_Format_Colummn_Ralias Ralias +A repository alias has changed. +\li \b 1 timestamp +\li \b 2 action ID (\c "ralias") +\li \b 3 old alias +\li \b 4 new alias +\li \b 5 userdata/transactionId + +\subsubsection g_ZyppHistory_Format_Colummn_Rurl Rurl +The primary URL of a repository has changed. +\li \b 1 timestamp +\li \b 2 action ID (\c "rurl") +\li \b 3 repository alias +\li \b 4 new URL +\li \b 5 userdata/transactionId + + +\section g_ZyppHistory_Example Example + +\code +2008-09-24 11:48:58|rremove|packman +2008-09-24 11:50:02|radd |packman|http://packman.iu-bremen.de/suse/11.0 +2008-09-24 11:53:10|install|amarok-yauap|1.4.10-25|x86_64||factory|4421dfa718ab73c805c1c695c97b1b67f39bf2f3 +2008-09-24 11:53:25|install|amarok-lang|1.4.10-25|x86_64||factory|691030edafcc4fbc22aa225350f9de32974e4bc2 +# Additional rpm output: +# warning: /var/cache/zypp/packages/packman/x86_64/amarok-1.4.10-100.pm.1.x86_64.rpm: Header V3 DSA signature: NOKEY, key ID 9a795806 +# +2008-09-24 11:53:45|install|amarok|1.4.10-100.pm.1|x86_64|root@kompost|packman|ee0fffa1e4eeaaeb8799bd05c6882ef74100d681 +\endcode + +*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/doc/autoinclude/groups.doc new/libzypp-12.4.0/doc/autoinclude/groups.doc --- old/libzypp-12.4.0/doc/autoinclude/groups.doc 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/doc/autoinclude/groups.doc 2012-11-23 18:11:08.000000000 +0100 @@ -23,3 +23,6 @@ /*! \defgroup g_Algorithm Algorithms */ //////////////////////////////////////////////////////////////////////////////// +/*! \defgroup g_Parser Parser +*/ +//////////////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/libzypp.spec.cmake new/libzypp-12.4.0/libzypp.spec.cmake --- old/libzypp-12.4.0/libzypp.spec.cmake 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/libzypp.spec.cmake 2012-11-23 18:11:08.000000000 +0100 @@ -73,7 +73,7 @@ BuildRequires: pkg-config %endif -BuildRequires: libsolv-devel +BuildRequires: libsolv-devel >= 0.2.1 %if 0%{?suse_version} >= 1100 %requires_eq libsolv-tools %else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/package/libzypp.changes new/libzypp-12.4.0/package/libzypp.changes --- old/libzypp-12.4.0/package/libzypp.changes 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/package/libzypp.changes 2012-11-23 18:11:08.000000000 +0100 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Nov 22 01:14:42 CET 2012 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Nov 18 01:13:44 CET 2012 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Tue Nov 13 15:40:10 CET 2012 - ma(a)suse.de - Forward userdata string to commit plugins in BEGINPLUGIN (fate#312521) Files old/libzypp-12.4.0/po/zypp-po.tar.bz2 and new/libzypp-12.4.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/tests/parser/CMakeLists.txt new/libzypp-12.4.0/tests/parser/CMakeLists.txt --- old/libzypp-12.4.0/tests/parser/CMakeLists.txt 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/tests/parser/CMakeLists.txt 2012-11-23 18:11:09.000000000 +0100 @@ -5,4 +5,4 @@ ADD_TESTS( ProductFileReader ) ADD_TESTS( RepoFileReader ) ADD_TESTS( RepoindexFileReader ) - +ADD_TESTS( HistoryLogReader ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/tests/parser/HistoryLogReader_test.cc new/libzypp-12.4.0/tests/parser/HistoryLogReader_test.cc --- old/libzypp-12.4.0/tests/parser/HistoryLogReader_test.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-12.4.0/tests/parser/HistoryLogReader_test.cc 2012-11-23 18:11:09.000000000 +0100 @@ -0,0 +1,29 @@ +#include "TestSetup.h" +#include "zypp/parser/HistoryLogReader.h" +#include "zypp/parser/ParseException.h" + +using namespace zypp; + +namespace +{ + bool ProcessItem( const HistoryItem::Ptr & ptr ) + { + DBG << ptr << endl; + return true; + } +} + +// Must be the first test! +BOOST_AUTO_TEST_CASE(basic) +{ + parser::HistoryLogReader parser( TESTS_SRC_DIR "/parser/HistoryLogReader_test.dat", + ProcessItem ); + + BOOST_CHECK_EQUAL( parser.ignoreInvalidItems(), false ); + BOOST_CHECK_THROW( parser.readAll(), parser::ParseException ); + + parser.setIgnoreInvalidItems( true ); + BOOST_CHECK_EQUAL( parser.ignoreInvalidItems(), true ); + parser.readAll(); + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/tests/parser/HistoryLogReader_test.dat new/libzypp-12.4.0/tests/parser/HistoryLogReader_test.dat --- old/libzypp-12.4.0/tests/parser/HistoryLogReader_test.dat 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-12.4.0/tests/parser/HistoryLogReader_test.dat 2012-11-23 18:11:09.000000000 +0100 @@ -0,0 +1,11 @@ +2009-09-29 07:24:46|radd |InstallationImage|file:/usr/src/packages/BUILD/openSUSE-images-11.2/gnome_cd/home/rpmdir| +2009-09-29 07:25:29|install|update-test-security|0-2.35|noarch|root@opensuse|InstallationImage|d99de2872270cbd436b0c10af85c286a1365a348| +2011-07-18 18:08:09|install|kernel-source|2.6.37.6-0.5.1|noarch||repo-update|7823612d9ca3de086c2cd4dca936f6a3f3e9313d| +# 2009-09-29 07:25:30 filesystem.rpm installed ok +# Additional rpm output: +# +2009-09-29 07:47:59|remove |PolicyKit-doc|0.9-15.20|x86_64|root@opensuse|trans\|ID +2009-09-29 07:47:32|rremove|InstallationImage| +2010-06-01 16:11:17|remove |xchat-python|2.8.6-43.13|x86_64|2848:y2base| +2010-06-01 16:11:17|bad |xchat-python|2.8.6-43.13|x86_64|2848:y2base| +[/] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/zypp/HistoryLog.cc new/libzypp-12.4.0/zypp/HistoryLog.cc --- old/libzypp-12.4.0/zypp/HistoryLog.cc 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/zypp/HistoryLog.cc 2012-11-23 18:11:08.000000000 +0100 @@ -192,27 +192,25 @@ return; _log - << timestamp() // 1 timestamp - << _sep << HistoryActionID::INSTALL.asString(true) // 2 action - << _sep << p->name() // 3 name - << _sep << p->edition() // 4 evr - << _sep << p->arch(); // 5 arch + << timestamp() // 1 timestamp + << _sep << HistoryActionID::INSTALL.asString(true) // 2 action + << _sep << p->name() // 3 name + << _sep << p->edition() // 4 evr + << _sep << p->arch(); // 5 arch // ApplLow is what the solver selected on behalf of the user. if (pi.status().isByUser() || pi.status().isByApplLow() ) - _log << _sep << userAtHostname(); // 6 reqested by + _log << _sep << userAtHostname(); // 6 reqested by else if (pi.status().isByApplHigh()) _log << _sep << pidAndAppname(); else _log << _sep; _log - << _sep << p->repoInfo().alias() // 7 repo alias - << _sep << p->checksum().checksum(); // 8 checksum - - _log << endl; - - //_log << pi << endl; + << _sep << p->repoInfo().alias() // 7 repo alias + << _sep << p->checksum().checksum() // 8 checksum + << _sep << str::escape(ZConfig::instance().userData(), _sep) // 9 userdata + << endl; } @@ -223,26 +221,23 @@ return; _log - << timestamp() // 1 timestamp - << _sep << HistoryActionID::REMOVE.asString(true) // 2 action - << _sep << p->name() // 3 name - << _sep << p->edition() // 4 evr - << _sep << p->arch(); // 5 arch + << timestamp() // 1 timestamp + << _sep << HistoryActionID::REMOVE.asString(true) // 2 action + << _sep << p->name() // 3 name + << _sep << p->edition() // 4 evr + << _sep << p->arch(); // 5 arch // ApplLow is what the solver selected on behalf of the user. if ( pi.status().isByUser() || pi.status().isByApplLow() ) - _log << _sep << userAtHostname(); // 6 reqested by + _log << _sep << userAtHostname(); // 6 reqested by else if (pi.status().isByApplHigh()) _log << _sep << pidAndAppname(); else _log << _sep; - // we don't have checksum in rpm db - // << _sep << p->checksum().checksum(); // x checksum - - _log << endl; - - //_log << pi << endl; + _log + << _sep << str::escape(ZConfig::instance().userData(), _sep) // 7 userdata + << endl; } ///////////////////////////////////////////////////////////////////////// @@ -250,11 +245,11 @@ void HistoryLog::addRepository(const RepoInfo & repo) { _log - << timestamp() // 1 timestamp - << _sep << HistoryActionID::REPO_ADD.asString(true) // 2 action - << _sep << str::escape(repo.alias(), _sep) // 3 alias - // what about the rest of the URLs?? - << _sep << *repo.baseUrlsBegin() // 4 primary URL + << timestamp() // 1 timestamp + << _sep << HistoryActionID::REPO_ADD.asString(true) // 2 action + << _sep << str::escape(repo.alias(), _sep) // 3 alias + << _sep << *repo.baseUrlsBegin() // 4 primary URL + << _sep << str::escape(ZConfig::instance().userData(), _sep) // 5 userdata << endl; } @@ -262,9 +257,10 @@ void HistoryLog::removeRepository(const RepoInfo & repo) { _log - << timestamp() // 1 timestamp - << _sep << HistoryActionID::REPO_REMOVE.asString(true) // 2 action - << _sep << str::escape(repo.alias(), _sep) // 3 alias + << timestamp() // 1 timestamp + << _sep << HistoryActionID::REPO_REMOVE.asString(true) // 2 action + << _sep << str::escape(repo.alias(), _sep) // 3 alias + << _sep << str::escape(ZConfig::instance().userData(), _sep) // 4 userdata << endl; } @@ -275,20 +271,21 @@ if (oldrepo.alias() != newrepo.alias()) { _log - << timestamp() // 1 timestamp - << _sep << HistoryActionID::REPO_CHANGE_ALIAS.asString(true) // 2 action - << _sep << str::escape(oldrepo.alias(), _sep) // 3 old alias - << _sep << str::escape(newrepo.alias(), _sep) // 4 new alias + << timestamp() // 1 timestamp + << _sep << HistoryActionID::REPO_CHANGE_ALIAS.asString(true) // 2 action + << _sep << str::escape(oldrepo.alias(), _sep) // 3 old alias + << _sep << str::escape(newrepo.alias(), _sep) // 4 new alias + << _sep << str::escape(ZConfig::instance().userData(), _sep) // 5 userdata << endl; } - if (*oldrepo.baseUrlsBegin() != *newrepo.baseUrlsBegin()) { _log - << timestamp() //1 timestamp - << _sep << HistoryActionID::REPO_CHANGE_URL.asString(true) // 2 action - << _sep << str::escape(oldrepo.alias(), _sep) // 3 old url - << _sep << *newrepo.baseUrlsBegin() // 4 new url + << timestamp() // 1 timestamp + << _sep << HistoryActionID::REPO_CHANGE_URL.asString(true) // 2 action + << _sep << str::escape(oldrepo.alias(), _sep) // 3 old url + << _sep << *newrepo.baseUrlsBegin() // 4 new url + << _sep << str::escape(ZConfig::instance().userData(), _sep) // 5 userdata << endl; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/zypp/HistoryLog.h new/libzypp-12.4.0/zypp/HistoryLog.h --- old/libzypp-12.4.0/zypp/HistoryLog.h 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/zypp/HistoryLog.h 2012-11-23 18:11:08.000000000 +0100 @@ -22,40 +22,36 @@ class RepoInfo; /////////////////////////////////////////////////////////////////// - // - // CLASS NAME : HistoryLog - /** - * Simple wrapper for progress log. Refcnt, filename and corresponding - * ofstream are static members. Logfile constructor raises, destructor - * lowers refcounter. On refcounter changing from 0->1, file is opened. - * Changing from 1->0 the file is closed. Thus Logfile objects should be - * local to those functions, writing the log, and must not be stored - * permanently. - * - * Usage: - * <code> - * some method () - * { - * PoolItem pi; - * ... - * HistoryLog().install(pi); - * ... - * HistoryLog().comment(someMessage); - * } - * </code> - * - * \note Take care to set proper target root dir if needed. Either pass - * it via the constructor, or set it via setRoot(Pathname) method. - * The default location of the file is determined by - * \ref ZConfig::historyLogPath() which defaults to - * /var/log/zypp/history. - * - * \see http://en.opensuse.org/Libzypp/Package_History - * - * \todo The implementation as pseudo signleton is questionable. - * Use shared_ptr instead of handcrafted ref/unref. Manage multiple - * logs at different locations. - */ + /// \class HistoryLog + /// \brief Writing the zypp history file + /// \ingroup g_ZyppHistory + /// + /// Reference counted signleton for writhing the zypp history file. + /// The history file is opened on demand and closed when the last + /// HistoryLog object drops its reference. Thus HistoryLog objects + /// should be local to those functions, writing the log, and must + /// not be stored permanently. + /// + /// \code + /// some method () + /// { + /// PoolItem pi; + /// ... + /// HistoryLog().install(pi); + /// ... + /// HistoryLog().comment(someMessage); + /// } + /// \endcode + /// + /// \note Take care to set proper target root dir if needed. Either pass + /// it via the constructor, or set it via setRoot(Pathname) method. + /// The default location of the file is determined by + /// \ref zypp::ZConfig::historyLogPath (default: \c /var/log/zypp/history). + /// + /// \todo The implementation as pseudo signleton is questionable. + /// Use shared_ptr instead of handcrafted ref/unref. Manage multiple + /// logs at different locations. + /////////////////////////////////////////////////////////////////// class HistoryLog { HistoryLog( const HistoryLog & ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/zypp/HistoryLogData.cc new/libzypp-12.4.0/zypp/HistoryLogData.cc --- old/libzypp-12.4.0/zypp/HistoryLogData.cc 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/zypp/HistoryLogData.cc 2012-11-23 18:11:08.000000000 +0100 @@ -32,62 +32,62 @@ // /////////////////////////////////////////////////////////////////// - static std::map<std::string,HistoryActionID::ID> _table; - - const HistoryActionID HistoryActionID::NONE(HistoryActionID::NONE_e); - const HistoryActionID HistoryActionID::INSTALL(HistoryActionID::INSTALL_e); - const HistoryActionID HistoryActionID::REMOVE(HistoryActionID::REMOVE_e); - const HistoryActionID HistoryActionID::REPO_ADD(HistoryActionID::REPO_ADD_e); - const HistoryActionID HistoryActionID::REPO_REMOVE(HistoryActionID::REPO_REMOVE_e); - const HistoryActionID HistoryActionID::REPO_CHANGE_ALIAS(HistoryActionID::REPO_CHANGE_ALIAS_e); - const HistoryActionID HistoryActionID::REPO_CHANGE_URL(HistoryActionID::REPO_CHANGE_URL_e); + const HistoryActionID HistoryActionID::NONE (HistoryActionID::NONE_e); + const HistoryActionID HistoryActionID::INSTALL (HistoryActionID::INSTALL_e); + const HistoryActionID HistoryActionID::REMOVE (HistoryActionID::REMOVE_e); + const HistoryActionID HistoryActionID::REPO_ADD (HistoryActionID::REPO_ADD_e); + const HistoryActionID HistoryActionID::REPO_REMOVE (HistoryActionID::REPO_REMOVE_e); + const HistoryActionID HistoryActionID::REPO_CHANGE_ALIAS (HistoryActionID::REPO_CHANGE_ALIAS_e); + const HistoryActionID HistoryActionID::REPO_CHANGE_URL (HistoryActionID::REPO_CHANGE_URL_e); HistoryActionID::HistoryActionID(const std::string & strval_r) : _id(parse(strval_r)) {} - HistoryActionID::ID HistoryActionID::parse(const std::string & strval_r) + HistoryActionID::ID HistoryActionID::parse( const std::string & strval_r ) { - if (_table.empty()) + typedef std::map<std::string,ID> MapType; + static MapType _table; + if ( _table.empty() ) { // initialize it - _table["install"] = INSTALL_e; - _table["remove"] = REMOVE_e; - _table["radd"] = REPO_ADD_e; - _table["rremove"] = REPO_REMOVE_e; - _table["ralias"] = REPO_CHANGE_ALIAS_e; - _table["rurl"] = REPO_CHANGE_URL_e; - _table["NONE"] = _table["none"] = HistoryActionID::NONE_e; + _table["install"] = INSTALL_e; + _table["remove"] = REMOVE_e; + _table["radd"] = REPO_ADD_e; + _table["rremove"] = REPO_REMOVE_e; + _table["ralias"] = REPO_CHANGE_ALIAS_e; + _table["rurl"] = REPO_CHANGE_URL_e; + _table["NONE"] = _table["none"] = NONE_e; } - std::map<std::string,HistoryActionID::ID>::const_iterator it = - _table.find(strval_r); - - if (it == _table.end()) - WAR << "Unknown history action ID '" + strval_r + "'"; - + MapType::const_iterator it = _table.find( strval_r ); + if ( it == _table.end() ) + { + WAR << "Unknown history action ID '" + strval_r + "'" << endl; + return NONE_e; + } return it->second; } - const std::string & HistoryActionID::asString(bool pad) const + const std::string & HistoryActionID::asString( bool pad ) const { - static std::map<ID, std::string> _table; + typedef std::pair<std::string,std::string> PairType; + typedef std::map<ID, PairType> MapType; + static MapType _table; if ( _table.empty() ) { - // initialize it - _table[INSTALL_e] = "install"; - _table[REMOVE_e] = "remove"; - _table[REPO_ADD_e] = "radd"; - _table[REPO_REMOVE_e] = "rremove"; - _table[REPO_CHANGE_ALIAS_e] = "ralias"; - _table[REPO_CHANGE_URL_e] = "rurl"; - _table[NONE_e] = "NONE"; + // initialize it pad(7) (for now) + _table[INSTALL_e] = PairType( "install" , "install" ); + _table[REMOVE_e] = PairType( "remove" , "remove " ); + _table[REPO_ADD_e] = PairType( "radd" , "radd " ); + _table[REPO_REMOVE_e] = PairType( "rremove" , "rremove" ); + _table[REPO_CHANGE_ALIAS_e] = PairType( "ralias" , "ralias " ); + _table[REPO_CHANGE_URL_e] = PairType( "rurl" , "rurl " ); + _table[NONE_e] = PairType( "NONE" , "NONE " ); } - // add spaces so that the size of the returned string is always 7 (for now) - if (pad) - return _table[_id].append(7 - _table[_id].size(), ' '); - return _table[_id]; + + return( pad ? _table[_id].second : _table[_id].first ); } std::ostream & operator << (std::ostream & str, const HistoryActionID & id) @@ -134,7 +134,7 @@ HistoryItemInstall::HistoryItemInstall(FieldVector & fields) : HistoryItem(fields) { - if (fields.size() != 8) + if (fields.size() < 8) ZYPP_THROW(ParseException( str::form("Bad number of fields. Got %zu, expected %u.", fields.size(), 8))); @@ -175,7 +175,7 @@ HistoryItemRemove::HistoryItemRemove(FieldVector & fields) : HistoryItem(fields) { - if (fields.size() != 6) + if (fields.size() < 6) ZYPP_THROW(ParseException( str::form("Bad number of fields. Got %zu, expected %u.", fields.size(), 6))); @@ -212,7 +212,7 @@ HistoryItemRepoAdd::HistoryItemRepoAdd(FieldVector & fields) : HistoryItem(fields) { - if (fields.size() != 4) + if (fields.size() < 4) ZYPP_THROW(ParseException( str::form("Bad number of fields. Got %zu, expected %u.", fields.size(), 4))); @@ -245,7 +245,7 @@ HistoryItemRepoRemove::HistoryItemRepoRemove(FieldVector & fields) : HistoryItem(fields) { - if (fields.size() != 3) + if (fields.size() < 3) ZYPP_THROW(ParseException( str::form("Bad number of fields. Got %zu, expected %u.", fields.size(), 3))); @@ -275,7 +275,7 @@ HistoryItemRepoAliasChange::HistoryItemRepoAliasChange(FieldVector & fields) : HistoryItem(fields) { - if (fields.size() != 4) + if (fields.size() < 4) ZYPP_THROW(ParseException( str::form("Bad number of fields. Got %zu, expected %u.", fields.size(), 4))); @@ -306,7 +306,7 @@ HistoryItemRepoUrlChange::HistoryItemRepoUrlChange(FieldVector & fields) : HistoryItem(fields) { - if (fields.size() != 4) + if (fields.size() < 4) ZYPP_THROW(ParseException( str::form("Bad number of fields. Got %zu, expected %u.", fields.size(), 4))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/zypp/HistoryLogData.h new/libzypp-12.4.0/zypp/HistoryLogData.h --- old/libzypp-12.4.0/zypp/HistoryLogData.h 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/zypp/HistoryLogData.h 2012-11-23 18:11:08.000000000 +0100 @@ -25,17 +25,12 @@ namespace zypp { - - /////////////////////////////////////////////////////////////////// - // - // CLASS NAME : HistoryActionID - // - /** - * Enumeration of known history actions. - * - * \ingroup g_EnumerationClass - */ + /// \class HistoryActionID + /// \brief Enumeration of known history actions. + /// \ingroup g_EnumerationClass + /// \ingroup g_ZyppHistory + /////////////////////////////////////////////////////////////////// struct HistoryActionID { static const HistoryActionID NONE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/zypp/parser/HistoryLogReader.cc new/libzypp-12.4.0/zypp/parser/HistoryLogReader.cc --- old/libzypp-12.4.0/zypp/parser/HistoryLogReader.cc 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/zypp/parser/HistoryLogReader.cc 2012-11-23 18:11:08.000000000 +0100 @@ -44,108 +44,115 @@ HistoryItem::Ptr createHistoryItem(HistoryItem::FieldVector & fields); void parseLine(const string & line, unsigned int lineNr); - void readAll(const ProgressData::ReceiverFnc & progress); - void readFrom(const Date & date, - const ProgressData::ReceiverFnc & progress); - void readFromTo( - const Date & fromDate, const Date & toDate, - const ProgressData::ReceiverFnc & progress); + void readAll( const ProgressData::ReceiverFnc & progress ); + void readFrom( const Date & date, const ProgressData::ReceiverFnc & progress ); + void readFromTo( const Date & fromDate, const Date & toDate, const ProgressData::ReceiverFnc & progress ); Pathname _filename; ProcessItem _callback; bool _ignoreInvalid; }; - HistoryLogReader::Impl::Impl( const Pathname & historyFile, - const ProcessItem & callback ) - : _filename(historyFile), _callback(callback), _ignoreInvalid(false) + + HistoryLogReader::Impl::Impl( const Pathname & historyFile, const ProcessItem & callback ) + : _filename( historyFile ) + , _callback( callback ) + , _ignoreInvalid( false ) {} - HistoryItem::Ptr - HistoryLogReader::Impl::createHistoryItem(HistoryItem::FieldVector & fields) + + HistoryItem::Ptr HistoryLogReader::Impl::createHistoryItem( HistoryItem::FieldVector & fields ) { - HistoryActionID aid(str::trim(fields[1])); - switch (aid.toEnum()) + HistoryActionID aid( str::trim( fields[1] ) ); + switch ( aid.toEnum() ) { case HistoryActionID::INSTALL_e: - return HistoryItemInstall::Ptr(new HistoryItemInstall(fields)); + return HistoryItemInstall::Ptr( new HistoryItemInstall( fields ) ); break; case HistoryActionID::REMOVE_e: - return HistoryItemRemove::Ptr(new HistoryItemRemove(fields)); + return HistoryItemRemove::Ptr( new HistoryItemRemove( fields ) ); break; case HistoryActionID::REPO_ADD_e: - return HistoryItemRepoAdd::Ptr(new HistoryItemRepoAdd(fields)); + return HistoryItemRepoAdd::Ptr( new HistoryItemRepoAdd( fields ) ); break; case HistoryActionID::REPO_REMOVE_e: - return HistoryItemRepoRemove::Ptr(new HistoryItemRepoRemove(fields)); + return HistoryItemRepoRemove::Ptr( new HistoryItemRepoRemove( fields ) ); break; case HistoryActionID::REPO_CHANGE_ALIAS_e: - return HistoryItemRepoAliasChange::Ptr(new HistoryItemRepoAliasChange(fields)); + return HistoryItemRepoAliasChange::Ptr( new HistoryItemRepoAliasChange( fields ) ); break; case HistoryActionID::REPO_CHANGE_URL_e: - return HistoryItemRepoUrlChange::Ptr(new HistoryItemRepoUrlChange(fields)); + return HistoryItemRepoUrlChange::Ptr( new HistoryItemRepoUrlChange( fields ) ); break; - default: - WAR << "Unknown history log action type: " << fields[1] << endl; + case HistoryActionID::NONE_e: + break; } - return HistoryItem::Ptr(); } - void HistoryLogReader::Impl::parseLine(const string & line, unsigned int lineNr) - { - HistoryItem::FieldVector fields; - HistoryItem::Ptr item_ptr; + void HistoryLogReader::Impl::parseLine( const string & line, unsigned int lineNr ) + { // parse into fields - str::splitEscaped(line, back_inserter(fields), "|", true); + HistoryItem::FieldVector fields; + str::splitEscaped( line, back_inserter(fields), "|", true ); - if (fields.size() <= 2) + if ( fields.size() <= 2 ) { - ParseException - e(str::form("Error in history log on line #%u.", lineNr)); - e.addHistory( - str::form("Bad number of fields. Got %zd, expected more than %d.", - fields.size(), 2)); - ZYPP_THROW(e); + if ( !_ignoreInvalid ) + { + ParseException e( str::form( "Error in history log on line #%u.", lineNr ) ); + e.addHistory( str::form( "Bad number of fields. Got %zd, expected more than %d.", fields.size(), 2 ) ); + ZYPP_THROW( e ); + } + else + { + WAR << "Ignoring suspicious non-comment entry on line #" << lineNr << endl; + return; + } } + HistoryItem::Ptr item_ptr; try { - item_ptr = createHistoryItem(fields); + item_ptr = createHistoryItem( fields ); } - catch (const Exception & e) + catch ( const Exception & e ) { ZYPP_CAUGHT(e); - ERR << "Invalid history log entry on line #" << lineNr << ":" << endl - << line << endl; + ERR << "Invalid history log entry on line #" << lineNr << " '"<< line << "'" << endl; - if (!_ignoreInvalid) + if ( !_ignoreInvalid ) { - ParseException newe( - str::form("Error in history log on line #%u.", lineNr ) ); - newe.remember(e); - ZYPP_THROW(newe); + ParseException newe( str::form( "Error in history log on line #%u.", lineNr ) ); + newe.remember( e ); + ZYPP_THROW( newe ); } } - if (item_ptr) - _callback(item_ptr); - else if (!_ignoreInvalid) - { - ParseException - e(str::form("Error in history log on line #%u.", lineNr)); - e.addHistory("Unknown entry type."); - ZYPP_THROW(e); + if ( item_ptr ) + { + _callback( item_ptr ); + } + else if ( !_ignoreInvalid ) + { + ParseException e( str::form( "Error in history log on line #%u.", lineNr ) ); + e.addHistory( "Unknown entry type." ); + ZYPP_THROW( e ); + } + else + { + WAR << "Unknown history log action type: " << fields[1] << " on line #" << lineNr << endl; } } + void HistoryLogReader::Impl::readAll(const ProgressData::ReceiverFnc & progress) { InputStream is(_filename); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/zypp/parser/HistoryLogReader.h new/libzypp-12.4.0/zypp/parser/HistoryLogReader.h --- old/libzypp-12.4.0/zypp/parser/HistoryLogReader.h 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/zypp/parser/HistoryLogReader.h 2012-11-23 18:11:08.000000000 +0100 @@ -29,47 +29,40 @@ namespace parser { ///////////////////////////////////////////////////////////////// - + /////////////////////////////////////////////////////////////////// + /// \class HistoryLogReader + /// \brief Zypp history file parser + /// \ingroup g_ZyppHistory + /// \ingroup g_ZyppParser + /// + /// Reads a zypp history log file and calls the ProcessItem function + /// passed in the constructor for each item read. + /// + /// \code + /// struct HistoryItemCollector + /// { + /// vector<HistoryItem::Ptr> items; + /// + /// bool operator()( const HistoryItem::Ptr & item_ptr ) + /// { + /// items.push_back(item_ptr); + /// return true; + /// } + /// } + /// ... + /// HistoryItemCollector ic; + /// HistoryLogReader reader("/var/log/zypp/history", boost::ref(ic)); + /// + /// try + /// { + /// reader.readAll(); + /// } + /// catch (const Exception & e) + /// { + /// cout << e.asUserHistory() << endl; + /// } + /// \endcode ///////////////////////////////////////////////////////////////////// - // - // CLASS NAME: HistoryLogReader - // - /** - * Reads a zypp history log file and calls the ProcessItem function passed - * in the constructor for each item read. - * - * Example: - * <code> - * - * struct HistoryItemCollector - * { - * vector<HistoryItem::Ptr> items; - * - * bool operator()( const HistoryItem::Ptr & item_ptr ) - * { - * items.push_back(item_ptr); - * return true; - * } - * } - * - * ... - * - * HistoryItemCollector ic; - * HistoryLogReader reader("/var/log/zypp/history", boost::ref(ic)); - * - * try - * { - * reader.readAll(); - * } - * catch (const Exception & e) - * { - * cout << e.asUserHistory() << endl; - * } - * - * </code> - * - * \see http://en.opensuse.org/Libzypp/Package_History - */ class HistoryLogReader { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.4.0/zypp/sat/Solvable.cc new/libzypp-12.4.0/zypp/sat/Solvable.cc --- old/libzypp-12.4.0/zypp/sat/Solvable.cc 2012-11-14 12:43:31.000000000 +0100 +++ new/libzypp-12.4.0/zypp/sat/Solvable.cc 2012-11-23 18:11:08.000000000 +0100 @@ -255,9 +255,11 @@ NO_SOLVABLE_RETURN( OnMediaLocation() ); // medianumber and path unsigned medianr; - const char * file = ::solvable_get_location( _solvable, &medianr ); + const char * file = ::solvable_lookup_location( _solvable, &medianr ); if ( ! file ) return OnMediaLocation(); + if ( ! medianr ) + medianr = 1; OnMediaLocation ret; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libprison for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package libprison for openSUSE:Factory checked in at 2012-12-03 09:49:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libprison (Old) and /work/SRC/openSUSE:Factory/.libprison.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libprison", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libprison/libprison.changes 2012-03-02 13:48:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libprison.new/libprison.changes 2012-12-03 09:49:13.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 25 10:47:22 UTC 2012 - cgiboudeaux(a)gmx.com + +- Fix the SLES build (%make_install doesn't exist) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libprison.spec ++++++ --- /var/tmp/diff_new_pack.054sOz/_old 2012-12-03 09:49:14.000000000 +0100 +++ /var/tmp/diff_new_pack.054sOz/_new 2012-12-03 09:49:14.000000000 +0100 @@ -63,15 +63,12 @@ %install cd build -%make_install +%kde4_makeinstall %post -n libprison0 -p /sbin/ldconfig %postun -n libprison0 -p /sbin/ldconfig -%clean - rm -rf %{buildroot} - %files -n libprison0 %defattr(-,root,root) %{_libdir}/libprison.so.* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0