April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit json-c.2735 for openSUSE:13.1:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package json-c.2735 for openSUSE:13.1:Update checked in at 2014-04-22 15:16:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/json-c.2735 (Old) and /work/SRC/openSUSE:13.1:Update/.json-c.2735.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "json-c.2735" Changes: -------- New Changes file: --- /dev/null 2014-04-17 09:46:44.096034755 +0200 +++ /work/SRC/openSUSE:13.1:Update/.json-c.2735.new/json-c.changes 2014-04-22 15:16:19.000000000 +0200 @@ -0,0 +1,103 @@ +------------------------------------------------------------------- +Wed Apr 9 09:54:51 UTC 2014 - idonmez(a)suse.com + +- Add json-c-hash-dos-and-overflow-random-seed-4e.patch to fix + CVE-2013-6370 and CVE-2013-6371 (bnc#870147) + +------------------------------------------------------------------- +Sun Mar 10 08:38:30 UTC 2013 - coolo(a)suse.com + +- add json-c-fix-headers.patch from master branch to fix compilation + of apps using the lib + +------------------------------------------------------------------- +Thu Mar 7 09:43:30 UTC 2013 - bruno(a)ioda-net.ch + +- Update to 0.10 version : + * Add a json_object_to_json_string_ext() function to allow output + to be formatted in a more human readable form. + * Add json_object_object_get_ex(), a NULL-safe get object method, + to be able to distinguish between a key not present and the value + being NULL. + * Add an alternative iterator implementation, see json_object_iterator.h + * Make json_object_iter public to enable external use of the + json_object_object_foreachC macro. + * Add a printbuf_memset() function to provide an effecient way to set and + append things like whitespace indentation. + * Adjust json_object_is_type and json_object_get_type so they return + json_type_null for NULL objects and handle NULL passed to + json_objct_object_get(). + * Rename boolean type to json_bool. + * Fix various compile issues for Visual Studio and MinGW. + * Allow json_tokener_parse_ex() to be re-used to parse multiple object. + Also, fix some parsing issues with capitalized hexadecimal numbers and + number in E notation. + * Add json_tokener_get_error() and json_tokener_error_desc() to better + encapsulate the process of retrieving errors while parsing. + * Various improvements to the documentation of many functions. + * Add new json_object_array_sort() function. + * Fix a bug in json_object_get_int(), which would incorrectly return 0 + when called on a string type object. + Eric Haszlakiewicz + * Add a json_type_to_name() function. + Eric Haszlakiewicz + * Add a json_tokener_parse_verbose() function. + Jehiah Czebotar + * Improve support for null bytes within JSON strings. + Jehiah Czebotar + * Fix file descriptor leak if memory allocation fails in json_util + Zachary Blair, zack_blair at hotmail dot com + * Add int64 support. Two new functions json_object_net_int64 and + json_object_get_int64. Binary compatibility preserved. + Eric Haszlakiewicz, EHASZLA at transunion com + Rui Miguel Silva Seabra, rms at 1407 dot org + * Fix subtle bug in linkhash where lookup could hang after all slots + were filled then successively freed. + Spotted by Jean-Marc Naud, j dash m at newtraxtech dot com + * Make json_object_from_file take const char *filename + Spotted by Vikram Raj V, vsagar at attinteractive dot com + * Add handling of surrogate pairs (json_tokener.c, test4.c, Makefile.am) + Brent Miller, bdmiller at yahoo dash inc dot com + * Correction to comment describing printbuf_memappend in printbuf.h + Brent Miller, bdmiller at yahoo dash inc dot com + +- Packaging : + * upgrade upstream location https://gitub.com/json-c/json-c/wiki + * cleanup old patches included now upstream + . json-c-0.9-linkhash.patch + . json-c-0.9-json_tokener.patch + . json-c-0.9-json_object_from_file.patch + . json-c-0.9-base.patch + * Redone lfs patch against new 0.10 release + * Removed empty NEWS file + +------------------------------------------------------------------- +Sun Apr 22 00:34:03 UTC 2012 - crrodriguez(a)opensuse.org + +- Fix LFS support in x86. +- Do not build with -Werror +- Remove "la" files +- tune up autotools scripts as well ensure config.h is included + everywhere + +------------------------------------------------------------------- +Sun Nov 13 13:50:27 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) + +------------------------------------------------------------------- +Sun Nov 13 09:11:46 UTC 2011 - coolo(a)suse.com + +- add libtool as explicit buildrequire to avoid implicit dependency from prjconf + +------------------------------------------------------------------- +Mon Aug 29 08:01:40 UTC 2011 - coolo(a)novell.com + +- add baselibs.conf for pulseaudio to use +- use original sources + +------------------------------------------------------------------- +Thu Nov 4 17:22:27 UTC 2010 - chris(a)computersalat.de + +- initial pkg 0.9 + New: ---- baselibs.conf json-c-0.10.tar.gz json-c-fix-headers.patch json-c-hash-dos-and-overflow-random-seed-4e.patch json-c-lfs.patch json-c.changes json-c.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ json-c.spec ++++++ # # spec file for package json-c # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define libname libjson %define libsoname %{libname}0 Name: json-c Summary: JSON implementation in C License: MIT Group: System/Libraries Version: 0.10 Release: 0 Url: https://gitub.com/%{name}/%{name}/wiki Source0: https://github.com/downloads/json-c/json-c/%{name}-%{version}.tar.gz Source1: baselibs.conf #Redone 0.10 patches Patch0: %{name}-lfs.patch # taken from master Patch1: %{name}-fix-headers.patch Patch2: %{name}-hash-dos-and-overflow-random-seed-4e.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libtool BuildRequires: pkg-config %description JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects. %package -n %{libsoname} Summary: JSON shared lib Group: System/Libraries %description -n %{libsoname} This package includes the JSON library. %package -n %{libname}-devel Summary: Development headers and libraries for json-c Group: Development/Libraries/C and C++ Requires: %{libsoname} = %{version} %description -n %{libname}-devel This package includes header files and scripts needed for developers using the json-c library %package -n %{libname}-doc Summary: Documentation files Group: Documentation/Other %if 0%{suse_version} >= 1120 BuildArch: noarch %endif %description -n %{libname}-doc This package includes alls docs %prep %setup -q -n %{name}-%{version} # Redone patches %patch0 -p1 %patch1 -p1 %patch2 -p1 %build autoreconf -fiv %configure --disable-static --with-pic %{__make} %{?_smp_mflags} %check %{__make} %{?_smp_mflags} check rm -rf %{buildroot}%{_libdir}/*.la %install %makeinstall DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} %post -n %{libsoname} -p /sbin/ldconfig %postun -n %{libsoname} -p /sbin/ldconfig %files -n %{libsoname} %defattr(-,root,root) %{_libdir}/%{libname}.so.* %files -n %{libname}-devel %defattr(-,root,root) %{_libdir}/%{libname}.so %{_includedir}/json %{_libdir}/pkgconfig/*.pc %files -n %{libname}-doc %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README README.html doc %changelog ++++++ baselibs.conf ++++++ libjson0 ++++++ json-c-fix-headers.patch ++++++ Index: json-c-0.10/Makefile.am =================================================================== --- json-c-0.10.orig/Makefile.am +++ json-c-0.10/Makefile.am @@ -17,6 +17,7 @@ libjsoninclude_HEADERS = \ json_config.h \ json_inttypes.h \ json_object.h \ + json_object_iterator.h \ json_object_private.h \ json_tokener.h \ json_util.h \ ++++++ json-c-hash-dos-and-overflow-random-seed-4e.patch ++++++ ++++ 859 lines (skipped) ++++++ json-c-lfs.patch ++++++ diff --git a/Makefile.am.inc b/Makefile.am.inc index b1ebce8..5886498 100644 --- a/Makefile.am.inc +++ b/Makefile.am.inc @@ -1,2 +1,2 @@ -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT +AM_CFLAGS = -Wall -Wwrite-strings -D_REENTRANT diff --git a/configure.in b/configure.in index bcb9027..eadf4f9 100644 --- a/configure.in +++ b/configure.in @@ -1,14 +1,17 @@ AC_PREREQ(2.52) # Process this file with autoconf to produce a configure script. -AC_INIT([json-c], 0.10, [json-c(a)googlegroups.com] +AC_INIT([json-c], [0.10], [json-c(a)googlegroups.com] AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AC_PROG_MAKE_SET # Checks for programs. - +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE + # Checks for libraries. # Checks for header files. diff --git a/linkhash.c b/linkhash.c index ddedc12..7f9426d 100644 --- a/linkhash.c +++ b/linkhash.c @@ -17,6 +17,7 @@ #include <stddef.h> #include <limits.h> +#include "config.h" #include "linkhash.h" void lh_abort(const char *msg, ...) diff --git a/tests/test1.c b/tests/test1.c index 9802eb1..71582c8 100644 --- a/tests/test1.c +++ b/tests/test1.c @@ -1,3 +1,4 @@ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <stddef.h> diff --git a/tests/test2.c b/tests/test2.c index 4a6b660..73afb5b 100644 --- a/tests/test2.c +++ b/tests/test2.c @@ -1,3 +1,4 @@ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <stddef.h> diff --git a/tests/test_printbuf.c b/tests/test_printbuf.c index ee3f80d..c704e22 100644 --- a/tests/test_printbuf.c +++ b/tests/test_printbuf.c @@ -1,3 +1,4 @@ +#include "config.h" #include <assert.h> #include <stddef.h> #include <stdio.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 patchinfo.2726 for openSUSE:12.3:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package patchinfo.2726 for openSUSE:12.3:Update checked in at 2014-04-22 15:15:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/patchinfo.2726 (Old) and /work/SRC/openSUSE:12.3:Update/.patchinfo.2726.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.2726" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <category>security</category> <rating>low</rating> <packager>draht</packager> <summary>CVE-2014-0128: squid can crash when SSLBump is used in combination with range requests.</summary> <description>The SSLBump feature acts as TLS/SSL termination for clients. If this feature is enabled, squid can crash with range requests, leading to a potential Denial of Service condition.</description> <issue tracker="cve" id="CVE-2014-0128"/> <issue tracker="bnc" id="867533"/> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit squid for openSUSE:12.3:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package squid for openSUSE:12.3:Update checked in at 2014-04-22 15:14:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/squid (Old) and /work/SRC/openSUSE:12.3:Update/.squid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "squid" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.ykPoX8/_old 2014-04-22 15:14:55.000000000 +0200 +++ /var/tmp/diff_new_pack.ykPoX8/_new 2014-04-22 15:14:55.000000000 +0200 @@ -1 +1 @@ -<link package='squid.1978' cicount='copy' /> +<link package='squid.2726' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cairo.2743 for openSUSE:13.1:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package cairo.2743 for openSUSE:13.1:Update checked in at 2014-04-22 12:45:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/cairo.2743 (Old) and /work/SRC/openSUSE:13.1:Update/.cairo.2743.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cairo.2743" Changes: -------- New Changes file: --- /dev/null 2014-04-17 09:46:44.096034755 +0200 +++ /work/SRC/openSUSE:13.1:Update/.cairo.2743.new/cairo.changes 2014-04-22 12:45:04.000000000 +0200 @@ -0,0 +1,939 @@ +------------------------------------------------------------------- +Fri Apr 11 12:57:09 UTC 2014 - jw(a)suse.com + +- Added fix_for_fdo77298.patch + So that inkscape can export 0.01mm lines again to PDF. Was broken in 1.12.3 + +------------------------------------------------------------------- +Wed Aug 28 20:42:58 UTC 2013 - idonmez(a)suse.com + +- Add cairo-disable-lto.patch to disable LTO on s390{x} to fix the + build. + +------------------------------------------------------------------- +Tue Aug 27 06:41:01 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 1.12.16: + + Set the correct orientation for simple boxes with a negative + scale factor. + + Fix the creation of the shading dictionary in PDF. + + Avoid upscaling bitmap fonts if possible. + + Fix an assertion failure within the mempool allocator for + shared memory. + + Fix allocation size for CFF subsets. + + Export cairo_matrix_t for GObject bindings. + + Stop leaking the image data when loading PNGs. + + Prevent an assertion failure when creating similar GL surfaces + larger than supported by hardware. + + Bugs fixed: fdo#61451, fdo#62885, fdo#61876, fdo#63196, + fdo#697357, fdo#61592, fdo#68014, fdo#63787. +- Drop cairo-reduce-buddy-assertion.patch: fixed upstream. + +------------------------------------------------------------------- +Mon Jul 8 18:49:31 CEST 2013 - sbrabec(a)suse.cz + +- Add cairo-reduce-buddy-assertion.patch: Fix eog crash on + assertion, after pressing Next (bnc#828074). + +------------------------------------------------------------------- +Sat May 25 20:58:42 UTC 2013 - dimstar(a)opensuse.org + +- Drop cairo-libpng16-v2.patch: in its current form, this patch + causes issues as that cairo.ImageSurface.create_from_png errors + out with 'MemoryError' in all cases (bnc#821766). + +------------------------------------------------------------------- +Tue Apr 2 11:57:02 UTC 2013 - pgajdos(a)suse.com + +- Add cairo-libpng16-v2.patch: Fix png usage with libpng 1.6: + call png_set_read_user_transform_fn() before + png_read_update_info() (bnc#810701). + +------------------------------------------------------------------- +Thu Feb 14 17:42:09 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 1.12.14: + + Prevent user callbacks accessing user-data during destroy to + prevent use-after-free bugs (mozilla#722975). + + Use standard names for glyphs in subset fonts (PDF) (fdo#60248) + + Fix detection of Win98. The logic for detecting Win98 + AlphaBlend() was inverted, disabling AlphaBlend() for everyone. + + Prevent numeric overflow from extrapolating polygon edges to + the clip boundary and causing severe render artifacts. + (fdo#60489). + + Fix computation of glyph string coordinates when breaking up + runs for xlib. + + Fix an assertion in the win32 backend for failing to clear its + similar-images (fdo#60519). +- Changes from version 1.12.12: + + Avoid replacing the entire image when uploading subimages + (fdo#59635). + + Force synchronisation for scratch SHM image buffers, so that we + do not overwrite data as it is being read by X (fdo#59635). + + Fix typos in detecting multisampling for the GL (MSAA) backend. + + Fix a memory leak in the GL (MSAA) backend. + + Fix a reference counting bug when mapping a GL surface to an + image. +- Changes from version 1.12.10: + + Append coincident elements to the recording's surface bbtree so + that the list is not corrupted and the overlapping elements + lost. + + Fix cairo-trace to correctly record map-to-image/unmap-image + and then replay them. + + Ignore MappingNotifies when running the XCB testsuite as they + are sent to all clients when the keyboard changes. The + testsuite would detect the unexpected event and complain. + + Handle very large images in the XCB backend. + + Fix a memory leak in the xlib/shm layer, and prevent use of + the SHM surfaces after the display is closed (fdo#58253). + + Handle resizing of bitmap fonts, in preparation for a fix to + fontconfig to correctly pass on the user request for scaling. + + Always include subroutine 4 (hint replacement idion) when + subsetting type 1 fonts in order to prevent a crash in + cgpdftops on Mac OS/X. + + Fix a couple of typos in the cairo-gobject.h header files for + introspection. + + Prevent a mutex deadlock when freeing a scaled-glyph containing + a recording-surface that itself references another scaled-glyph + (fdo#54950). + + Make scaled-font cache actually thread-safe and prevent + use-after-frees. + + Restore support for older versions of XRender. A couple of + typos and a few forgotten chunks prevented the xlib + compositor from running correctly with XRender < 0.10. +- Enable building of the GL Backend. + +------------------------------------------------------------------- +Tue Nov 6 12:21:53 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 1.12.8: + + Expand the sanity checking for broken combinations of + XSendEvent and ShmCompletionEvent. + + Notice that "The X.Org Foundation" sometimes also identifies + itself as "The Xorg Foundation". + + Handle various ages of libXext and its Shm headers. + + Fix the invalid clipping of the source drawable when using SHM + transport to upload images (fdo#56547). + + Handle all Type1 postscript operators for better font + compatibility (fdo#56265). + + Fix a couple of memory leaks in Type1 font subsetting + (fdo#56566) + + Tighten the evaluation of the start/stop pen vertices, and catch + a few instances where we would use a fan instead of a bevel. + (fdo#56432) + + Fix assumption that geometric clipping always succeeds with the + span-compositor (fdo#56574) + + Fix call to spline intersection when evaluating whether a stoke + is visible. + + Remember to copy inferior sources when using SHM to readback the + surface for use as a source. +- Changes from version 1.12.6: + + Fix the recording surface to actually snapshot the source and + so fix PDF drawing. + + Calling XSendEvent with an XShmCompletionEvent is incompatabile + with older Xorg servers. + + Reorder CloseDisplay chain so that XShm is not reinstantiated + after shutdown, causing a potential crash if the Display was + immediately recreated using the same memory address. + + Make sure that the Xserver has attached to the SHM segment + before deleting it from the global namespace on systems that do + not support deferred deletion. + + Type1 subsetting support for PDF (and PS) was once again + improved to work with a larger number of PDF readers. + + GLESv2 build fixes and improved support for embedded GPUs. + + Tweak the invisible pen detection for applications that are + currently using too large values for geometric tolerance. + + A build fix for older freetype libraries. +- Rebase cairo-modules-no-version.patch. + +------------------------------------------------------------------- +Fri Oct 12 12:00:24 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 1.12.4: + + Interior boxes were being dropped when amalgamating regions + during tesselation (fdo#49446) + + Allow building without gtk-doc installed + + Invalid edge generation whilst reducing complex polygons + (fdo#50852) + + Stroking around tight cusps + + Use locale correct formats for reading font subsetting and + valid buffers (fdo#51443) + + Ensure that the type1 subset includes all the glyph encodings + (fdo#53040) + + Upload the whole source for a repeating pattern (fdo#51910) + + Fix damage tracking to handle continuation chunks corectly and + so prevent crashes on win32 (fdo#53384) + + Avoid emitting miter joins for degenerate line segments + (fdo#407107) + + Convert the relative path semgents into the backend coordinates + and then back again to user coordinates (fdo#54732) + + Fix extents computations for a degenerate path consisting only + of a move-to (fdo#54549) + + Prevent crashing on a degenerate project edge after polygon + intersection (fdo#54822). +- Add pkgconfig(xext) BuildRequires: new verified dependency. + +------------------------------------------------------------------- +Sun Apr 29 21:09:19 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 1.12.2: + + Allow applications to create 0x0 xlib surfaces, such as used by + LibreOffice (fdo#49118) + + Trim composite extents for SOURCE/CLEAR operators to the mask. + + Use fallback fonts in PDF for unhandled computed glyph widths + (fdo#48349) + + Handle snapshots of recording surfaces for analysing pattern + extents. Fixes a regression of reporting the PDF bounding box + as being the page size. + + Fix allocation size for PDF pattern ids. (fdo#49089) + + Fix emission of rectilinear dashed segments, with and without + scaling, and application of degenerate line joins. + + Clamp unbounded fixup polygons to the clip extents. + + Prevent infinite loop due to rounding errors whilst + incrementing along dashes. + + Prevent overflow for inline a8 span filling. + + Miscellaneous build fixes for Cygwin on Windows and Solaris. +- Drop cairo-fix-wrong-allocation.patch: fixed upstream. + ++++ 742 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.cairo.2743.new/cairo.changes New: ---- baselibs.conf cairo-1.12.16.tar.xz cairo-disable-lto.patch cairo-modules-no-version.patch cairo.changes cairo.spec fix_for_fdo77298.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cairo.spec ++++++ # # spec file for package cairo # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define build_xcb_backend 1 %define build_gl_backend 1 Name: cairo Version: 1.12.16 Release: 0 Summary: Vector Graphics Library with Cross-Device Output Support License: LGPL-2.1+ or MPL-1.1 Group: System/Libraries Url: http://cairographics.org/ Source: http://cairographics.org/releases/%{name}-%{version}.tar.xz Source99: baselibs.conf # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 dimstar(a)opensuse.org -- Build modules with -module -avoid-version. Patch0: cairo-modules-no-version.patch # PATCH-FIX-OPENSUSE cairo-disable-lto.patch idoenmez(a)suse.de -- Disable -flto on s390{x} Patch1: cairo-disable-lto.patch # https://bugs.freedesktop.org/show_bug.cgi?id=77298 Patch2: fix_for_fdo77298.patch # These libraries are needed only for tests. # Do not enable tests in build systems, it causes build loop! #BuildRequires: librsvg-devel poppler-devel %if %build_gl_backend BuildRequires: Mesa-devel %endif BuildRequires: gtk-doc # Needed by patch0 BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(pixman-1) >= 0.16.0 BuildRequires: pkgconfig(x11) %if %build_xcb_backend BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-shm) %endif BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xrender) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Cairo is a vector graphics library with cross-device output support. Currently supported output targets include the X Window System, in-memory image buffers, and PostScript. Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available. %package -n libcairo2 Summary: Vector Graphics Library with Cross-Device Output Support License: LGPL-2.1+ or MPL-1.1 Group: System/Libraries Provides: cairo = %{version} Obsoletes: cairo < %{version} # bug437293 %ifarch ppc64 Obsoletes: cairo-64bit %endif # %description -n libcairo2 Cairo is a vector graphics library with cross-device output support. Currently supported output targets include the X Window System, in-memory image buffers, and PostScript. Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available. %package -n libcairo-gobject2 Summary: Vector Graphics Library with Cross-Device Output Support License: LGPL-2.1+ or MPL-1.1 Group: System/Libraries %description -n libcairo-gobject2 Cairo is a vector graphics library with cross-device output support. Currently supported output targets include the X Window System, in-memory image buffers, and PostScript. Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available. This library contains GType declarations for Cairo types. It is also meant to support gobject-introspection binding creation. %package -n libcairo-script-interpreter2 Summary: Vector Graphics Library with Cross-Device Output Support License: LGPL-2.1+ or MPL-1.1 Group: System/Libraries %description -n libcairo-script-interpreter2 Cairo is a vector graphics library with cross-device output support. Currently supported output targets include the X Window System, in-memory image buffers, and PostScript. Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available. %package tools Summary: Vector Graphics Library with Cross-Device Output Support -- Utilities License: GPL-3.0+ Group: Development/Libraries/X11 # We need an explicit requires since nothing links to the cairo library Requires: libcairo2 = %{version} # Named changed during development of 11.4 Provides: %{name}-utils = %{version} Obsoletes: %{name}-utils < %{version} %description tools Cairo is a vector graphics library with cross-device output support. Currently supported output targets include the X Window System, in-memory image buffers, and PostScript. Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available. This package contains various cairo utilities. %package devel Summary: Development environment for cairo License: LGPL-2.1+ or MPL-1.1 Group: Development/Libraries/X11 Requires: libcairo-gobject2 = %{version} Requires: libcairo-script-interpreter2 = %{version} Requires: libcairo2 = %{version} Provides: cairo-doc = %{version} Obsoletes: cairo-doc < %{version} # bug437293 %ifarch ppc64 Obsoletes: cairo-devel-64bit %endif # %description devel This package contains all files necessary to build binaries using cairo. %prep %setup -q %patch0 -p1 %ifarch s390 s390x %patch1 -p1 %endif # fix_for_fdo77298.patch %patch2 -p1 %build # Needed by patch0 and patch1 NOCONFIGURE=1 ./autogen.sh %configure \ --with-pic \ --enable-fc \ --enable-ft \ %if %build_gl_backend --enable-gl \ %endif --enable-ps \ --enable-pdf \ --enable-script \ --enable-svg \ --enable-tee \ %if %build_xcb_backend --enable-xcb \ %endif --enable-xlib \ --disable-gtk-doc \ --disable-static make %{?_smp_mflags} V=1 %install %makeinstall %if 0%{?suse_version} > 1110 find %{buildroot} -type f -name "*.la" -delete -print %endif %post -n libcairo2 -p /sbin/ldconfig %postun -n libcairo2 -p /sbin/ldconfig %post -n libcairo-gobject2 -p /sbin/ldconfig %postun -n libcairo-gobject2 -p /sbin/ldconfig %post -n libcairo-script-interpreter2 -p /sbin/ldconfig %postun -n libcairo-script-interpreter2 -p /sbin/ldconfig %files -n libcairo2 %defattr(-, root, root) %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README %{_libdir}/libcairo.so.* %files -n libcairo-gobject2 %defattr(-, root, root) %{_libdir}/libcairo-gobject.so.2* %files -n libcairo-script-interpreter2 %defattr(-, root, root) %doc util/cairo-script/COPYING %{_libdir}/libcairo-script-interpreter.so.* %files tools %defattr(-, root, root) %doc util/cairo-trace/COPYING util/cairo-trace/COPYING-GPL-3 %{_bindir}/cairo-sphinx %{_bindir}/cairo-trace %dir %{_libdir}/cairo %{_libdir}/cairo/cairo-fdr.so %{_libdir}/cairo/cairo-sphinx.so %{_libdir}/cairo/libcairo-trace.so %files devel %defattr(-, root, root) %doc PORTING_GUIDE %doc %{_datadir}/gtk-doc/html/cairo %{_includedir}/cairo/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %if 0%{?suse_version} <= 1110 %{_libdir}/*.la %endif %changelog ++++++ baselibs.conf ++++++ libcairo2 provides "cairo-<targettype> = <version>" obsoletes "cairo-<targettype> < <version>" libcairo-gobject2 libcairo-script-interpreter2 cairo-devel requires -cairo-<targettype> requires "libcairo2-<targettype> = <version>" requires "libcairo-gobject2-<targettype> = <version>" requires "libcairo-script-interpreter2-<targettype> = <version>" ++++++ cairo-disable-lto.patch ++++++ Index: cairo-1.12.16/build/configure.ac.warnings =================================================================== --- cairo-1.12.16.orig/build/configure.ac.warnings +++ cairo-1.12.16/build/configure.ac.warnings @@ -36,16 +36,6 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_T dnl We also abuse the warning-flag facility to enable other compiler dnl options. Namely, the following: -dnl -flto working really needs a test link, not just a compile - -safe_MAYBE_WARN="$MAYBE_WARN" -MAYBE_WARN="$MAYBE_WARN -flto" -AC_TRY_LINK([],[ - int main(int argc, char **argv) { return 0; } -],[],[ - MAYBE_WARN="$safe_MAYBE_WARN" -]) - MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" dnl Also to turn various gcc/glibc-specific preprocessor checks ++++++ cairo-modules-no-version.patch ++++++ Index: cairo-1.12.8/util/cairo-fdr/Makefile.am =================================================================== --- cairo-1.12.8.orig/util/cairo-fdr/Makefile.am +++ cairo-1.12.8/util/cairo-fdr/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ cairo_fdr_la_SOURCES = fdr.c cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS) cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS) -cairo_fdr_la_LDFLAGS = -module -no-undefined +cairo_fdr_la_LDFLAGS = -module -no-undefined -avoid-version if CAIRO_HAS_DL cairo_fdr_la_LIBADD = -ldl endif Index: cairo-1.12.8/util/cairo-trace/Makefile.am =================================================================== --- cairo-1.12.8.orig/util/cairo-trace/Makefile.am +++ cairo-1.12.8/util/cairo-trace/Makefile.am @@ -11,7 +11,7 @@ libcairo_trace_la_SOURCES = trace.c libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \ $(AM_CPPFLAGS) libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS) -libcairo_trace_la_LDFLAGS = -no-undefined +libcairo_trace_la_LDFLAGS = -no-undefined -module -avoid-version libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz if CAIRO_HAS_DL Index: cairo-1.12.8/util/cairo-sphinx/Makefile.am =================================================================== --- cairo-1.12.8.orig/util/cairo-sphinx/Makefile.am +++ cairo-1.12.8/util/cairo-sphinx/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ cairo_sphinx_la_SOURCES = fdr.c cairo_sphinx_la_CPPFLAGS = $(AM_CPPFLAGS) cairo_sphinx_la_CFLAGS = $(CAIRO_CFLAGS) -cairo_sphinx_la_LDFLAGS = -module -no-undefined +cairo_sphinx_la_LDFLAGS = -module -no-undefined -avoid-version if CAIRO_HAS_DL cairo_sphinx_la_LIBADD = -ldl endif ++++++ fix_for_fdo77298.patch ++++++ diff --git a/src/cairo-pen.c b/src/cairo-pen.c index 61be0e8..8eed775 100644 --- a/src/cairo-pen.c +++ b/src/cairo-pen.c @@ -284,7 +284,20 @@ _cairo_pen_vertices_needed (double tolerance, radius); int num_vertices; - if (tolerance >= 4*major_axis) { /* XXX relaxed from 2*major for inkscape */ + if (tolerance >= 100*major_axis) { /* XXX relaxed from 2*major for inkscape */ + /* + * When we decide for num_vertices = 1, the object is not drawn. + * To avoid https://bugs.freedesktop.org/show_bug.cgi?id=77298 + * we use 100*major -- this just helps us to the 0.001mm line width. + * + * The author of the 'XXX relaxed' comment above, originally used 4*major, + * which is not sufficient for my inkscape lasercutter usecase. + * + * Please double check if num_vertices == 1 should never be done (for PDF). + * + * jnweiger(a)gmail.com + */ + // fprintf(stderr, "tolerance=%g major_axis=%g -> num_vertices = 1\n", tolerance, major_axis); num_vertices = 1; } else if (tolerance >= major_axis) { num_vertices = 4; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit WindowMaker for openSUSE:13.1:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package WindowMaker for openSUSE:13.1:Update checked in at 2014-04-22 12:43:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/WindowMaker (Old) and /work/SRC/openSUSE:13.1:Update/.WindowMaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "WindowMaker" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='WindowMaker.2738' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit roundcubemail for openSUSE:13.1:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package roundcubemail for openSUSE:13.1:Update checked in at 2014-04-22 12:43:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/roundcubemail (Old) and /work/SRC/openSUSE:13.1:Update/.roundcubemail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "roundcubemail" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.tLH8t7/_old 2014-04-22 12:43:45.000000000 +0200 +++ /var/tmp/diff_new_pack.tLH8t7/_new 2014-04-22 12:43:45.000000000 +0200 @@ -1 +1 @@ -<link package='roundcubemail.2622' cicount='copy' /> +<link package='roundcubemail.2739' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit roundcubemail for openSUSE:12.3:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package roundcubemail for openSUSE:12.3:Update checked in at 2014-04-22 12:43:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/roundcubemail (Old) and /work/SRC/openSUSE:12.3:Update/.roundcubemail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "roundcubemail" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.P42aaS/_old 2014-04-22 12:43:44.000000000 +0200 +++ /var/tmp/diff_new_pack.P42aaS/_new 2014-04-22 12:43:44.000000000 +0200 @@ -1 +1 @@ -<link package='roundcubemail.2622' cicount='copy' /> +<link package='roundcubemail.2739' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4 for openSUSE:13.1:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package kdepim4 for openSUSE:13.1:Update checked in at 2014-04-22 12:41:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/kdepim4 (Old) and /work/SRC/openSUSE:13.1:Update/.kdepim4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.bDp0zT/_old 2014-04-22 12:41:40.000000000 +0200 +++ /var/tmp/diff_new_pack.bDp0zT/_new 2014-04-22 12:41:40.000000000 +0200 @@ -1 +1 @@ -<link package='kdepim4.2510' cicount='copy' /> +<link package='kdepim4.2747' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4.2747 for openSUSE:13.1:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package kdepim4.2747 for openSUSE:13.1:Update checked in at 2014-04-22 12:41:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/kdepim4.2747 (Old) and /work/SRC/openSUSE:13.1:Update/.kdepim4.2747.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4.2747" Changes: -------- New Changes file: --- /dev/null 2014-04-17 09:46:44.096034755 +0200 +++ /work/SRC/openSUSE:13.1:Update/.kdepim4.2747.new/kdepim4.changes 2014-04-22 12:41:37.000000000 +0200 @@ -0,0 +1,1358 @@ +------------------------------------------------------------------- +Sun Apr 13 07:43:51 UTC 2014 - ctrippe(a)opensuse.org + +- make it possible to manually select untrusted PGP keys + (bnc#859984, kde#328311); added patch pgp_key_select.diff + +------------------------------------------------------------------- +Sat Jan 4 09:52:08 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.11.5 + * KDE 4.11.5 maintenance release + * See http://www.kde.org/announcements/announce-4.11.5.php +- Drop fix-a-bug-that-eats-100-of-CPU.patch as it was + included upstream + +------------------------------------------------------------------- +Mon Dec 16 01:44:57 UTC 2013 - hrvoje.senjan(a)gmail.com + +- added patches: + * fix-a-bug-that-eats-100-of-CPU.patch: resolves kde#323929 (and + many possible duplicates) where kmail would stuck in a loop + constantly trying to collect same data + +------------------------------------------------------------------- +Sun Dec 1 09:06:08 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.11.4 + * KDE 4.11.4 maintenance release + * See http://www.kde.org/announcements/announce-4.11.4.php + +------------------------------------------------------------------- +Sat Nov 2 15:04:13 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.11.3 + * KDE 4.11.3 bugfix release + * See http://www.kde.org/announcements/announce-4.11.3.php + +------------------------------------------------------------------- +Sat Sep 28 15:06:50 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.11.2 + * KDE 4.11.2 bugfix release + * See http://www.kde.org/announcements/announce-4.11.2.php +- Dropped patches based on upstream inclusion: + 0001-Kontact-crashed-after-trying-to-export-as-WebSite.patch + +------------------------------------------------------------------- +Mon Sep 9 16:53:34 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Added 0001-Kontact-crashed-after-trying-to-export-as-WebSite.patch + from upstream, for resolving kde#324493 + +------------------------------------------------------------------- +Sun Sep 1 09:57:39 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.11.1 + * KDE 4.11.1 bugfix release + * See http://www.kde.org/announcements/announce-4.11.1.php + +------------------------------------------------------------------- +Thu Aug 8 14:59:06 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.11.0 + * KDE 4.11 Final release + * See http://www.kde.org/announcements/4.11/ + +------------------------------------------------------------------- +Thu Jul 25 22:44:25 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 4.10.97 + * KDE 4.11 RC 2 release + * See http://www.kde.org/announcements/announce-4.11-rc2.php + +------------------------------------------------------------------- +Mon Jul 15 08:13:05 UTC 2013 - cgiboudeaux(a)gmx.com + +- Update to 4.10.95 + * KDE 4.11 RC 1 release + * See http://www.kde.org/announcements/announce-4.11-rc1.php + +------------------------------------------------------------------- +Thu Jun 27 18:10:07 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 19:12:24 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php +- Added libkactivities-devel, link-grammar-devel and cyrus-sasl-devel + BuildRequires + +------------------------------------------------------------------- +Sat Jun 1 09:22:03 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.10.4 + * Bugfix release + * See http://www.kde.org/announcements/announce-4.10.4.php + * resolves bnc#8122760 + +------------------------------------------------------------------- +Sat May 4 16:52:40 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.10.3 + * Bugfix release + * See http://www.kde.org/announcements/announce-4.10.3.php + * resolves bnc#818500 +- Dropped patches included with this release: + 0001-Add-missing-mimetype-for-contact-groups-in-the-direc.patches, + 0002-Use-the-index-we-just-calculated-a-bit-faster.patch, + 0003-Fix-kmail-autocompletion-from-akonadi.patch and + 0004-Fix-Bug-316256.patch + +------------------------------------------------------------------- +Sat Apr 20 15:52:18 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Added 0004-Fix-Bug-316256.patch, fixes build with newer boost + (kde#316256) + +------------------------------------------------------------------- +Mon Apr 8 16:06:51 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Add three patches from upstream, those fix mail completion that + was lost with 4.10.2 (kde#259949): + 0001-Add-missing-mimetype-for-contact-groups-in-the-direc.patches, + 0002-Use-the-index-we-just-calculated-a-bit-faster.patch and + 0003-Fix-kmail-autocompletion-from-akonadi.patch + +------------------------------------------------------------------- +Mon Apr 1 19:17:14 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.10.2 + * Contains bug fixes +- Drop akregator-bug305494.diff, it is included upstream + +------------------------------------------------------------------- +Mon Mar 11 06:58:56 UTC 2013 - mlin(a)suse.com + +- Update desktop-files.diff + * Don't removed Icon=kleopatra in kleopatra.desktop (bnc#807946) +- Added patch akregator-bug305494.diff from upstream to (bko#305494) + +------------------------------------------------------------------- +Mon Mar 4 15:09:11 UTC 2013 - wbauer(a)tmo.at + +- Remove "News" from categories in akregator.desktop (bnc#807301) + +------------------------------------------------------------------- +Sat Mar 2 15:34:35 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.10.1 + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information + +------------------------------------------------------------------- +Thu Jan 31 17:45:10 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.10.0 + * This is the final release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Thu Jan 17 08:02:54 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.9.98 + * This is the third RC release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Thu Jan 3 21:07:05 UTC 2013 - tittiatcoke(a)gmail.com + +- Update to 4.9.97 + * This is the second RC release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Wed Dec 19 18:34:18 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.95 + * This is the first RC release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Sat Dec 1 20:00:52 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.90 + * This is the second Beta release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Sun Nov 25 11:23:44 UTC 2012 - tittiatcoke(a)gmail.com + +- Drop patch 4_8_branch.diff as it is not used at all + +------------------------------------------------------------------- +Sat Nov 24 12:49:27 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.80 ++++ 1161 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.kdepim4.2747.new/kdepim4.changes New: ---- akregator-useragent.diff desktop-files.diff kdepim-4.11.5.tar.xz kdepim4.changes kdepim4.spec knode-kontact-default.diff pgp_key_select.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ # # spec file for package kdepim4 # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: kdepim4 Version: 4.11.5 Release: 0 Summary: Base package of kdepim License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source0: kdepim-%{version}.tar.xz Patch1: akregator-useragent.diff #TODO desktop-files.diff need an update for upcoming 4.11.5 due to fixed kontact-import-wizard icon missing Patch2: desktop-files.diff Patch3: knode-kontact-default.diff #PATCH-FIX-UPSTREAM Fixes a bug, when manually selecting one or more PGP keys which are not marked as trusted. bnc#859984 Patch4: pgp_key_select.diff BuildRequires: cyrus-sasl-devel BuildRequires: fdupes BuildRequires: gpgme-devel BuildRequires: grantlee-devel BuildRequires: libassuan-devel BuildRequires: libkactivities-devel >= %version BuildRequires: libkdepimlibs4-devel >= %version BuildRequires: libnepomukwidgets-devel BuildRequires: libqca2-devel BuildRequires: link-grammar-devel BuildRequires: nepomuk-core-devel BuildRequires: xz Requires: libkdepim4 = %{version} Suggests: akregator Suggests: blogilo Suggests: kaddressbook Suggests: kalarm Suggests: kjots Suggests: kleopatra Suggests: kmail Suggests: knode Suggests: ktnef Suggests: knotes Suggests: kontact Suggests: korganizer Suggests: ktimetracker Suggests: libkdepim4 BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_akonadi_requires %kde4_pimlibs_requires %kde4_runtime_requires %description This package contains the core files of the kdepim module. %prep %setup -q -n kdepim-%{version} %patch1 %patch2 %patch3 %patch4 -p1 %build %ifarch ppc64 RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif %cmake_kde4 -d build -- -DKDEPIM_BUILD_MOBILE=OFF %make_jobs %install cd build %kde4_makeinstall %create_subdir_filelist -d akonadi_next -v akonadi.devel %create_subdir_filelist -d akregator -v devel %create_subdir_filelist -d blogilo -v devel %create_subdir_filelist -d kaddressbook -v devel %create_subdir_filelist -d kalarm -v devel %create_subdir_filelist -d kjots -v devel %create_subdir_filelist -d kleopatra/libkleopatraclient -f libkdepim -v libkdepim.devel %create_subdir_filelist -d kmail -v devel %create_subdir_filelist -d kmailcvt -f kmail %create_subdir_filelist -d knode -v devel %create_subdir_filelist -d ktnef -v devel %create_subdir_filelist -d knotes -v devel %create_subdir_filelist -d kontact -v devel %create_subdir_filelist -d korganizer -v devel %create_subdir_filelist -d ktimetracker %create_subdir_filelist -d libkdepim -v libkdepim.devel cd .. %if 0 cat filelists/akonadi.devel | while read line; do echo "%exclude $line";done >>filelists/devel %endif #remove kontact plugins' desktop files that are in subpackages from the kontact list akregatorplugins="%{_kde4_modulesdir}/kontact_akregatorplugin.so %{_kde4_servicesdir}/kontact/akregatorplugin.desktop" kaddressbookplugin="%{_kde4_modulesdir}/kontact_kaddressbookplugin.so" kjotsplugin="%{_kde4_modulesdir}/kontact_kjotsplugin.so %{_kde4_servicesdir}/kontact/kjots_plugin.desktop" kmailplugin="%{_kde4_modulesdir}/kontact_kmailplugin.so %{_kde4_servicesdir}/kontact/kmailplugin.desktop" knodeplugin="%{_kde4_modulesdir}/kontact_knodeplugin.so %{_kde4_servicesdir}/kontact/knodeplugin.desktop" knotesplugin="%{_kde4_modulesdir}/kontact_knotesplugin.so %{_kde4_servicesdir}/kontact/knotesplugin.desktop" korganizerplugins="%{_kde4_modulesdir}/kontact_journalplugin.so %{_kde4_modulesdir}/kontact_korganizerplugin.so %{_kde4_modulesdir}/kontact_todoplugin.so %{_kde4_servicesdir}/kontact/korganizerplugin.desktop %{_kde4_servicesdir}/kontact/journalplugin.desktop %{_kde4_servicesdir}/kontact/todoplugin.desktop" for i in $akregatorplugins $kaddressbookplugin $kjotsplugin $kmailplugin $knodeplugin $knotesplugin $korganizerplugins $ktimetrackerplugin do sed -ri s,$i,, filelists/kontact done for i in $akregatorplugins do echo $i >> filelists/akregator done for i in $kaddressbookplugin do echo $i >> filelists/kaddressbook done for i in $kjotsplugin do echo $i >> filelists/kjots done for i in $kmailplugin do echo $i >> filelists/kmail done for i in $knodeplugin do echo $i >> filelists/knode done for i in $knotesplugin do echo $i >> filelists/knotes done for i in $korganizerplugins do echo $i >> filelists/korganizer done for i in $ktimetrackerplugin do echo $i >> filelists/ktimetracker done sed -ri s,.*/usr/%{_lib}/libkabcommon.so.*,, filelists/kaddressbook grep "/usr/lib" filelists/libkdepim | grep "/kde4/" >filelists/libkdepim.devel cat filelists/libkdepim.devel | while read line; do echo "%exclude $line";done >>filelists/devel %create_exclude_filelist %suse_update_desktop_file -r blogilo Utility WebUtility %suse_update_desktop_file -u akonadiconsole Network Email %suse_update_desktop_file KNode Network News %suse_update_desktop_file Kjots Utility TimeUtility %suse_update_desktop_file Kontact Office Core-Office %suse_update_desktop_file -r akregator Network RSS-News %suse_update_desktop_file kaddressbook Office ContactManagement %suse_update_desktop_file kalarm Utility TimeUtility %suse_update_desktop_file kleopatra Utility Security %suse_update_desktop_file knotes Utility DesktopUtility %suse_update_desktop_file korganizer Office Calendar %suse_update_desktop_file ktimetracker Utility TimeUtility %suse_update_desktop_file -u importwizard Network Email %kde_post_install #Restrict fdupes call to not cause unwanted dependencies between packages %fdupes -s %{buildroot}%{_kde4_htmldir} %fdupes -s %{buildroot}%{_kde4_appsdir}/libkleopatra/ %fdupes -s %{buildroot}%{_kde4_appsdir}/knode/ %fdupes -s %{buildroot}%{_kde4_appsdir}/kmail2/ %fdupes -s %{buildroot}%{_kde4_iconsdir} %kde_post_install rm %{buildroot}%{_kde4_libdir}/*.so grep -v "%{_kde4_libdir}/lib.*so$" filelists/akonadi.devel > filelists/akonadi.devel.upd grep -v "%{_kde4_libdir}/lib.*so$" filelists/akonadi_next > filelists/akonadi_next.upd grep -v "%{_kde4_libdir}/lib.*so$" filelists/akregator > filelists/akregator.upd grep -v "%{_kde4_libdir}/lib.*so$" filelists/exclude > filelists/exclude.upd grep -v "%{_kde4_libdir}/lib.*so$" filelists/kalarm > filelists/kalarm.upd grep -v "%{_kde4_libdir}/lib.*so$" filelists/knode > filelists/knode.upd grep -v "%{_kde4_libdir}/lib.*so$" filelists/korganizer > filelists/korganizer.upd grep -v "%{_kde4_libdir}/lib.*so$" filelists/libkdepim > filelists/libkdepim.upd rm filelists/devel %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf %{buildroot} rm -rf filelists %package -n akonadi Summary: KDE Resources for PIM Storage Service License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE Requires: kdepim4-runtime = %{version} Requires: soprano Provides: kde4-akonadi = 4.3.0 Obsoletes: akonadi-devel < 4.4.60 Obsoletes: kde4-akonadi < 4.3.0 Provides: akonadi-devel = 4.4.60 %kde4_runtime_requires %kde4_pimlibs_requires %kde4_akonadi_requires %description -n akonadi This package contains the KDE resources for Akonadi, the KDE PIM storage service. %post -n akonadi -p /sbin/ldconfig %postun -n akonadi -p /sbin/ldconfig %files -n akonadi -f filelists/akonadi_next.upd %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %dir %{_datadir}/akonadi %dir %{_datadir}/akonadi/agents %dir %{_kde4_libdir}/akonadi %dir %{_kde4_libdir}/akonadi/contact %dir %{_kde4_libdir}/akonadi/contact/editorpageplugins %{_datadir}/akonadi/agents/mailfilteragent.desktop %{_datadir}/akonadi/agents/archivemailagent.desktop %{_datadir}/akonadi/agents/sendlateragent.desktop %{_kde4_libdir}/akonadi/contact/editorpageplugins/cryptopageplugin.so %package -n akregator Summary: RSS Feed Reader License: LGPL-2.1+ Group: Productivity/Networking/News/Utilities Requires: libkdepim4 = %{version} Provides: kde4-akregator = 4.3.0 Obsoletes: kde4-akregator < 4.3.0 %kde4_runtime_requires %kde4_pimlibs_requires %description -n akregator A KDE Feed Aggregator %post -n akregator -p /sbin/ldconfig %postun -n akregator -p /sbin/ldconfig %files -n akregator -f filelists/akregator.upd %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %package -n blogilo Summary: KDE Blog Editor License: LGPL-2.1+ Group: Productivity/Editors/Other Requires: libkdepim4 = %{version} Requires: libktexteditor Provides: bilbo = 1.0 Obsoletes: bilbo < 1.0 %kde4_runtime_requires %kde4_pimlibs_requires %description -n blogilo A blog editor for KDE %post -n blogilo -p /sbin/ldconfig %postun -n blogilo -p /sbin/ldconfig %files -n blogilo -f filelists/blogilo %defattr(-,root,root) %package -n kaddressbook Summary: Address Manager License: LGPL-2.1+ Group: Productivity/Networking/Email/Utilities Requires: kdepim4-runtime = %{version} Requires: libkdepim4 = %{version} Provides: kde4-kaddressbook = 4.3.0 Obsoletes: kde4-kaddressbook < 4.3.0 %kde4_akonadi_requires %kde4_runtime_requires %kde4_pimlibs_requires %description -n kaddressbook The KDE Address Book %post -n kaddressbook -p /sbin/ldconfig %postun -n kaddressbook -p /sbin/ldconfig %files -n kaddressbook -f filelists/kaddressbook %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %package -n kmail Summary: Mail Client License: GPL-2.0 Group: Productivity/Networking/Email/Clients Requires: akonadi-runtime Requires: kdepim4-runtime = %{version} Requires: libkdepim4 = %{version} Provides: kde4-kmail = 4.3.0 Obsoletes: kde4-kmail < 4.3.0 %kde4_runtime_requires %kde4_pimlibs_requires %description -n kmail KMail is the KDE mail client. %post -n kmail -p /sbin/ldconfig %postun -n kmail -p /sbin/ldconfig %files -n kmail -f filelists/kmail %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %config %{_kde4_configdir}/kmail.antispamrc %config %{_kde4_configdir}/kmail.antivirusrc %{_kde4_appsdir}/kmail2/pics/* %package -n knode Summary: News Reader License: LGPL-2.1+ Group: Productivity/Networking/News/Clients Requires: libkdepim4 = %{version} Provides: kde4-knode = 4.3.0 Obsoletes: kde4-knode < 4.3.0 %kde4_runtime_requires %kde4_pimlibs_requires %description -n knode KNode is a usenet news reader for KDE. %post -n knode -p /sbin/ldconfig %postun -n knode -p /sbin/ldconfig %files -n knode -f filelists/knode.upd %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %{_kde4_appsdir}/knode/pics/* %package -n ktnef Summary: Viewer for email attachments in TNEF format License: LGPL-2.1+ Group: Productivity/Networking/Email/Clients Requires: akonadi-runtime Requires: kdepim4-runtime = %version Requires: libkdepim4 = %version %kde4_runtime_requires %kde4_pimlibs_requires %description -n ktnef KTNEF is a viewer for email attachments in the TNEF format. %post -n ktnef -p /sbin/ldconfig %postun -n ktnef -p /sbin/ldconfig %files -n ktnef -f filelists/ktnef %defattr(-,root,root) %{_kde4_iconsdir}/locolor/*/*/ktnef*.png %package -n knotes Summary: Popup Notes License: LGPL-2.1+ Group: Productivity/Other Requires: libkdepim4 = %{version} Provides: kde4-knotes = 4.3.0 Obsoletes: kde4-knotes < 4.3.0 %kde4_runtime_requires %kde4_pimlibs_requires %description -n knotes KNotes is a note taking application for KDE. %post -n knotes -p /sbin/ldconfig %postun -n knotes -p /sbin/ldconfig %files -n knotes -f filelists/knotes %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %exclude %{_kde4_appsdir}/knotes/knotes_part.rc %package -n kontact Summary: Personal Information Manager License: LGPL-2.1+ Group: Productivity/Other Requires: libkdepim4 = %{version} Recommends: kmail Suggests: kaddressbook Suggests: kjots Suggests: knode Suggests: knotes Suggests: korganizer Suggests: ktimetracker Obsoletes: kde4-kontact < 4.3.0 Provides: kde4-kontact = 4.3.0 %kde4_runtime_requires %kde4_pimlibs_requires %kde4_akonadi_requires %description -n kontact Kontact combines the individual applications KMail, KAddressBook and KOrganizer as views in one window. %post -n kontact -p /sbin/ldconfig %postun -n kontact -p /sbin/ldconfig %files -n kontact -f filelists/kontact %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %package -n korganizer Summary: Personal Organizer License: GPL-2.0 Group: Productivity/Office/Organizers Requires: kdepim4-runtime = %{version} Requires: libkdepim4 = %{version} Provides: kde4-korganizer = 4.3.0 Obsoletes: kde4-korganizer < 4.3.0 %kde4_runtime_requires %kde4_pimlibs_requires %kde4_akonadi_requires %description -n korganizer KOrganizer is a calendar application for KDE. %post -n korganizer -p /sbin/ldconfig %postun -n korganizer -p /sbin/ldconfig %files -n korganizer -f filelists/korganizer.upd %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %config %{_kde4_configdir}/korganizer.knsrc %{_kde4_servicetypesdir}/calendardecoration.desktop %{_kde4_servicetypesdir}/calendarplugin.desktop %package -n ktimetracker Summary: Personal Time Tracker License: LGPL-2.1+ Group: Productivity/Other Requires: libkdepim4 = %{version} Provides: kde4-ktimetracker = 4.3.0 Obsoletes: kde4-ktimetracker < 4.3.0 %kde4_runtime_requires %kde4_pimlibs_requires %description -n ktimetracker KTimeTracker tracks time spent on various tasks. %post -n ktimetracker -p /sbin/ldconfig %postun -n ktimetracker -p /sbin/ldconfig %files -n ktimetracker -f filelists/ktimetracker %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %package -n kjots Summary: Note Taker License: GPL-2.0+ Group: Productivity/Other Requires: libkdepim4 = %{version} Provides: kde4-kjots = 4.3.0 Obsoletes: kde4-kjots < 4.3.0 %kde4_akonadi_requires %kde4_runtime_requires %kde4_pimlibs_requires %description -n kjots KDE Note Taking Utility %post -n kjots -p /sbin/ldconfig %postun -n kjots -p /sbin/ldconfig %files -n kjots -f filelists/kjots %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %package -n kalarm Summary: Personal Alarm Scheduler License: LGPL-2.1+ Group: Productivity/Other Requires: libkdepim4 = %{version} Provides: kde4-kalarm = 4.3.0 Obsoletes: kde4-kalarm < 4.3.0 %kde4_runtime_requires %kde4_pimlibs_requires %kde4_akonadi_requires %description -n kalarm Personal alarm message, command and email scheduler for KDE %post -n kalarm -p /sbin/ldconfig %postun -n kalarm -p /sbin/ldconfig %files -n kalarm -f filelists/kalarm.upd %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %config %{_sysconfdir}/dbus-1/system.d/org.kde.kalarmrtcwake.conf %package -n libkdepim4 Summary: KDE PIM Libraries License: LGPL-2.1+ Group: System/GUI/KDE Obsoletes: libkdepim4-devel < 4.6.0 Provides: libkdepim4-devel = 4.6.0 %requires_eq akonadi %requires_ge libqt4-x11 %description -n libkdepim4 This package contains the basic packages for KDE PIM applications. %post -n libkdepim4 -p /sbin/ldconfig %postun -n libkdepim4 -p /sbin/ldconfig %files -n libkdepim4 -f filelists/libkdepim.upd %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %{_kde4_modulesdir}/kcm_ldap.so %{_kde4_modulesdir}/plugins/designer/kdepimwidgets.so %files -f filelists/exclude.upd %defattr(-,root,root) %doc COPYING COPYING.LIB COPYING.DOC README %config %{_kde4_configdir}/libkleopatrarc %doc %lang(en) %{_kde4_htmldir}/en/kontact-admin %doc %lang(en) %{_kde4_htmldir}/en/kabcclient %doc %lang(en) %{_kde4_htmldir}/en/konsolekalendar %doc %lang(en) %{_kde4_htmldir}/en/kioslave/news %doc %lang(en) %{_kde4_htmldir}/en/kioslave %doc %lang(en) %{_kde4_htmldir}/en/kwatchgnupg %doc %lang(en) %{_kde4_htmldir}/en/akonadi_archivemail_agent %doc %lang(en) %{_kde4_htmldir}/en/importwizard %doc %lang(en) %{_kde4_htmldir}/en/headerthemeeditor %doc %lang(en) %{_kde4_htmldir}/en/kleopatra %doc %lang(en) %{_kde4_htmldir}/en/akonadi_sendlater_agent/ %doc %lang(en) %{_kde4_htmldir}/en/pimsettingexporter %{_datadir}/dbus-1/interfaces/* %dir %{_datadir}/ontology/kde %{_datadir}/ontology/kde/messagetag.ontology %{_datadir}/ontology/kde/messagetag.trig %{_kde4_applicationsdir}/* %{_kde4_appsdir} %{_kde4_bindir}/* %{_kde4_configkcfgdir} %{_kde4_iconsdir}/hicolor %{_kde4_iconsdir}/oxygen %{_kde4_libdir}/*.so.* %{_kde4_mandir}/man1/kabcclient.1.gz %{_kde4_modulesdir}/* %{_kde4_servicesdir} %exclude %{_kde4_appsdir}/kmail2/pics/* %exclude %{_kde4_appsdir}/knode/pics/* %exclude %{_kde4_configdir}/messageviewer_header_themes.knsrc %changelog ++++++ akregator-useragent.diff ++++++ --- akregator/src/akregator_part.cpp +++ akregator/src/akregator_part.cpp @@ -264,7 +264,7 @@ Part::Part( QWidget *parentWidget, QObje connect(m_autosaveTimer, SIGNAL(timeout()), this, SLOT(slotSaveFeedList())); m_autosaveTimer->start(5*60*1000); // 5 minutes - QString useragent = QString( "Akregator/%1; syndication" ).arg( KDEPIM_VERSION ); + QString useragent = QString( "Akregator/%1; syndication SUSE" ).arg( KDEPIM_VERSION ); if( !Settings::customUserAgent().isEmpty() ) useragent = Settings::customUserAgent(); ++++++ desktop-files.diff ++++++ Index: akonadiconsole/akonadiconsole.desktop =================================================================== --- akonadiconsole/akonadiconsole.desktop.orig +++ akonadiconsole/akonadiconsole.desktop @@ -103,4 +103,5 @@ Comment[x-test]=xxAkonadi Management and Comment[zh_CN]=用于管理和调试 Akonadi 的控制台 Comment[zh_TW]=Akonadi 管理與除錯主控台 Terminal=false -Categories=Qt;KDE;Development; +Categories=Qt;KDE;Development;Debugger;X-KDE-Utilities-PIM; +Hidden=true Index: ktimetracker/support/ktimetracker.desktop =================================================================== --- ktimetracker/support/ktimetracker.desktop.orig +++ ktimetracker/support/ktimetracker.desktop @@ -122,4 +122,4 @@ Type=Application Terminal=false X-KDE-StartupNotify=true X-DBUS-StartupType=Multi -Categories=Qt;KDE;Utility;Office;Monitor;X-KDE-Utilities-PIM; +Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM; Index: kleopatra/kleopatra.desktop =================================================================== --- kleopatra/kleopatra.desktop.orig +++ kleopatra/kleopatra.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Qt;KDE;Utility; +Categories=Qt;KDE;Utility;Security;X-KDE-Utilities-PIM; Exec=kleopatra Icon=kleopatra Name=Kleopatra Index: importwizard/importwizard.desktop =================================================================== --- importwizard/importwizard.desktop.orig +++ importwizard/importwizard.desktop @@ -21,7 +21,6 @@ Name[zh_TW]=KMail 匯入精靈 Exec=importwizard Type=Application -Icon=kontact-import-wizard X-DocPath=importwizard/index.html Comment=Launch the import wizard to migrate data from mailer as thunderbird/evolution etc. Comment[bs]=Pokrenite i uvedite čarobnjaka za pomjeranje podataka iz mailera kao thunderbird/evolution etc. ++++++ knode-kontact-default.diff ++++++ Index: kontact/plugins/knode/knodeplugin.desktop =================================================================== --- kontact/plugins/knode/knodeplugin.desktop.orig +++ kontact/plugins/knode/knodeplugin.desktop @@ -13,7 +13,7 @@ X-KDE-KontactPluginHasSummary=false X-KDE-PluginInfo-Name=kontact_knodeplugin X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=false +X-KDE-PluginInfo-EnabledByDefault=true Comment=Kontact KNode Plugin Comment[af]=Kontact KNode inprop module ++++++ pgp_key_select.diff ++++++ commit 5cc79e9246caee7875bd640bd6264476bb7330ce Author: Sandro Knauß <mail(a)sandroknauss.de> Date: Wed Jan 22 19:08:26 2014 +0100 make it possible to manually select untrusted PGP keys Fixes a bug in method "selectKeys", when manually selecting one or more keys which are not marked as trusted. Method "selectKeys" is only called from method "getEncryptionKeys" in lines: 1656, 1696 (patch written by kolAflash <kolAflash(a)kolahilft.de>, sponserd by me) BUG: 328311 FIXED-IN: 4.12.2 REVIEW: 115182 diff --git a/messagecomposer/composer/keyresolver.cpp b/messagecomposer/composer/keyresolver.cpp index 17e7342..a9fcecd 100644 --- a/messagecomposer/composer/keyresolver.cpp +++ b/messagecomposer/composer/keyresolver.cpp @@ -1623,7 +1623,7 @@ std::vector<GpgME::Key> Kleo::KeyResolver::selectKeys( std::vector<GpgME::Key> keys = dlg->selectedKeys(); keys.erase( std::remove_if( keys.begin(), keys.end(), - NotValidTrustedEncryptionKey ), // -= trusted? + NotValidEncryptionKey ), keys.end() ); if ( !keys.empty() && dlg->rememberSelection() ) { setKeysForAddress( person, dlg->pgpKeyFingerprints(), dlg->smimeFingerprints() ); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit umbrello for openSUSE:13.1:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package umbrello for openSUSE:13.1:Update checked in at 2014-04-22 12:40:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/umbrello (Old) and /work/SRC/openSUSE:13.1:Update/.umbrello.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "umbrello" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.LqNg10/_old 2014-04-22 12:40:57.000000000 +0200 +++ /var/tmp/diff_new_pack.LqNg10/_new 2014-04-22 12:40:57.000000000 +0200 @@ -1 +1 @@ -<link package='umbrello.2510' cicount='copy' /> +<link package='umbrello.2746' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0