May 2011 - openSUSE Commits - openSUSE Mailing Lists

drop libdwarf from openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, FYI: Package libdwarf was dropped from openSUSE:Factory at Tue May 10 09:59:58 CEST 2011. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=li… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtksourceviewmm2 for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package gtksourceviewmm2 for openSUSE:Factory checked in at Tue May 10 09:58:43 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtksourceviewmm2/gtksourceviewmm2.changes 2011-04-28 11:24:56.000000000 +0200 @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Thu Apr 28 10:13:06 CEST 2011 - vuntz(a)opensuse.org + +- New package, loosely based on libgtksourceviewmm that it will + replace: libgtksourceviewmm is a very old version of the code. +- Initial version: 2.10.1. + calling whatdependson for head-i586 New: ---- gtksourceviewmm-2.10.1.tar.bz2 gtksourceviewmm2.changes gtksourceviewmm2.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtksourceviewmm2.spec ++++++ # # spec file for package gtksourceviewmm2 # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: gtksourceviewmm2 %define _name gtksourceviewmm Version: 2.10.1 Release: 1 # FIXME: if there is a new upstream version, remove --disable-documentation from configure: this is right now broken because of the move to mm-common upstream, and we need a tarball to have this work. License: LGPLv2.1+ Summary: C++ interface for gtksourceview Url: http://projects.gnome.org/gtksourceviewmm/ Group: System/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/2.10/%{_name}-%{vers… BuildRequires: gcc-c++ BuildRequires: pkgconfig(gtkmm-2.4) BuildRequires: pkgconfig(gtksourceview-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description gtksourceviewmm provides a C++ interface to the gtksourceview library. %package -n libgtksourceviewmm-2_0-2 License: LGPLv2.1+ Summary: C++ interface for gtksourceview Group: System/Libraries %description -n libgtksourceviewmm-2_0-2 gtksourceviewmm provides a C++ interface to the gtksourceview library. %package devel License: LGPLv2.1+ Summary: C++ interface for gtksourceview -- Development Files Group: Development/Libraries/C and C++ Requires: libgtksourceviewmm-2_0-2 = %{version} # Packages that were created by libgtksourceviewmm Provides: libgtksourceviewmm-2_0-devel = %{version} Obsoletes: libgtksourceviewmm-2_0-devel < %{version} Provides: libgtksourceviewmm-doc = %{version} Obsoletes: libgtksourceviewmm-doc < %{version} %description devel gtksourceviewmm provides a C++ interface to the gtksourceview library. %prep %setup -q -n %{_name}-%{version} %build %configure \ --disable-static \ --disable-documentation make %{?_smp_mflags} %install %make_install find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %post -n libgtksourceviewmm-2_0-2 -p /sbin/ldconfig %postun -n libgtksourceviewmm-2_0-2 -p /sbin/ldconfig %clean rm -rf %{buildroot} %files -n libgtksourceviewmm-2_0-2 %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/gtksourceviewmm-2.0/ %{_libdir}/gtksourceviewmm-2.0/ %{_libdir}/*.so %{_libdir}/pkgconfig/gtksourceviewmm-2.0.pc %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit startup-notification for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package startup-notification for openSUSE:Factory checked in at Tue May 10 09:56:05 CEST 2011. -------- --- GNOME/startup-notification/startup-notification.changes 2010-10-11 18:18:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/startup-notification/startup-notification.changes 2011-05-06 10:38:30.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 6 10:30:24 CEST 2011 - vuntz(a)opensuse.org + +- Update to version 0.11: + + Remove Xlib support, use only xcb and x11-xcb + + Support APPLICATION_ID key +- Drop startup-notification-application-id.patch and + startup-notification-sn-launcher-screen.patch: fixed upstream. +- Fix License tags: the librarys is LGPLv2+, not GPLv2+. +- Change startup-notification Obsoletes from <= to < now that we + have a new upstream version. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- startup-notification-0.10.tar.bz2 startup-notification-application-id.patch startup-notification-sn-launcher-screen.patch New: ---- startup-notification-0.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ startup-notification.spec ++++++ --- /var/tmp/diff_new_pack.iuCyLz/_old 2011-05-10 09:55:27.000000000 +0200 +++ /var/tmp/diff_new_pack.iuCyLz/_new 2011-05-10 09:55:27.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package startup-notification (Version 0.10) +# spec file for package startup-notification # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,20 +19,15 @@ Name: startup-notification -BuildRequires: xorg-x11-devel -Url: http://www.freedesktop.org/wiki/Software/startup-notification -License: GPLv2+ -Group: System/X11/Utilities -Version: 0.10 -Release: 10 -# NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) +Version: 0.11 +Release: 1 Summary: Reference Implementation for the Startup-Notification Protocol +License: LGPLv2+ +Group: System/X11/Utilities +Url: http://www.freedesktop.org/wiki/Software/startup-notification Source: startup-notification-%{version}.tar.bz2 Source99: baselibs.conf -# PATCH-FEATURE-UPSTREAM startup-notification-application-id.patch vuntz(a)opensuse.org -- Add git commit to support APPLICATION_ID. This is useful for gnome-shell. -Patch0: startup-notification-application-id.patch -# PATCH-FIX-UPSTREAM startup-notification-sn-launcher-screen.patch vuntz(a)opensuse.org -- Taken from git, to use the screen number in sn-launcher -Patch1: startup-notification-sn-launcher-screen.patch +BuildRequires: xorg-x11-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,12 +35,11 @@ startup-notification protocol. %package -n libstartup-notification-1-0 -License: GPLv2+ +License: LGPLv2+ Group: System/X11/Utilities Summary: Reference Implementation for the Startup-Notification Protocol Provides: %{name} = %{version} -# Note: we keep <= (and a rpmlint warning...) until we get a version higher than 0.10 (when this provides/obsoletes was introduced) -Obsoletes: %{name} <= %{version} +Obsoletes: %{name} < %{version} # bug437293 %ifarch ppc64 Obsoletes: startup-notification-64bit @@ -57,7 +51,7 @@ startup-notification protocol. %package devel -License: GPLv2+ +License: LGPLv2+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME Requires: libstartup-notification-1-0 = %{version} @@ -73,8 +67,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure --disable-static ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.iuCyLz/_old 2011-05-10 09:55:27.000000000 +0200 +++ /var/tmp/diff_new_pack.iuCyLz/_new 2011-05-10 09:55:27.000000000 +0200 @@ -1,3 +1,3 @@ libstartup-notification-1-0 provides "startup-notification-<targettype> = <version>" - obsoletes "startup-notification-<targettype> <= <version>" + obsoletes "startup-notification-<targettype> < <version>" ++++++ startup-notification-0.10.tar.bz2 -> startup-notification-0.11.tar.bz2 ++++++ ++++ 29061 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/NEWS new/startup-notification-0.11/NEWS --- old/startup-notification-0.10/NEWS 2009-04-13 12:56:28.000000000 +0200 +++ new/startup-notification-0.11/NEWS 2011-05-05 11:37:03.000000000 +0200 @@ -1,3 +1,9 @@ +0.11 +==== + + - Remove Xlib support, use only xcb and x11-xcb (Julien Danjou) + - Support APPLICATION_ID key (Colin Walters) + 0.10 ==== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/config.h.in new/startup-notification-0.11/config.h.in --- old/startup-notification-0.10/config.h.in 2009-04-13 12:58:12.000000000 +0200 +++ new/startup-notification-0.11/config.h.in 2011-05-05 11:38:13.000000000 +0200 @@ -55,6 +55,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/configure.in new/startup-notification-0.11/configure.in --- old/startup-notification-0.10/configure.in 2009-04-03 16:53:51.000000000 +0200 +++ new/startup-notification-0.11/configure.in 2011-05-05 11:37:24.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([startup-notification], [0.10], +AC_INIT([startup-notification], [0.11], [http://www.freedesktop.org/Software/startup-notification] AC_CONFIG_SRCDIR(libsn/sn-launchee.c) @@ -78,17 +78,17 @@ ## try definining HAVE_BACKTRACE AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)]) -PKG_CHECK_MODULES([xcb], [xcb],, +PKG_CHECK_MODULES([xcb], [xcb >= 1.6],, [AC_MSG_ERROR([Cannot find xcb])]) PKG_CHECK_MODULES([xcb_aux], [xcb-aux],, [AC_MSG_ERROR([Cannot find xcb-aux])]) PKG_CHECK_MODULES([xcb_event], [xcb-event],, [AC_MSG_ERROR([Cannot find xcb-event])]) -PKG_CHECK_MODULES([xcb_atom], [xcb-atom],, - [AC_MSG_ERROR([Cannot find xcb-atom])]) +PKG_CHECK_MODULES([x11_xcb], [x11-xcb],, + [AC_MSG_ERROR([Cannot find x11-xcb])]) -LIBSN_CFLAGS="$X_CFLAGS $xcb_CFLAGS $xcb_aux_CFLAGS $xcb_event_CFLAGS $xcb_atom_CFLAGS" -LIBSN_LIBS=" $xcb_LIBS $xcb_aux_LIBS $xcb_event_LIBS $xcb_atom_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" +LIBSN_CFLAGS="$xcb_CFLAGS $xcb_aux_CFLAGS $xcb_event_CFLAGS $x11_xcb_CFLAGS" +LIBSN_LIBS="$xcb_LIBS $xcb_aux_LIBS $x11_xcb_LIBS" AC_SUBST(LIBSN_CFLAGS) AC_SUBST(LIBSN_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/doc/startup-notification.txt new/startup-notification-0.11/doc/startup-notification.txt --- old/startup-notification-0.10/doc/startup-notification.txt 2009-04-03 12:11:34.000000000 +0200 +++ new/startup-notification-0.11/doc/startup-notification.txt 2010-03-26 14:35:05.000000000 +0100 @@ -300,6 +300,16 @@ have their window mapped on the desktop specified by the value of DESKTOP. + APPLICATION_ID + + When launching an application using a .desktop file from + the normal application paths (see desktop file specification), + this should be basename of the .desktop file. + For example: "foo.desktop". + + When launching a .desktop file NOT in the paths, this should + be an absolute path to the .desktop file. + Some details of the startup sequence: - "new" and "change" messages are sent by the launcher code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-common.c new/startup-notification-0.11/libsn/sn-common.c --- old/startup-notification-0.10/libsn/sn-common.c 2009-04-03 16:55:32.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-common.c 2011-05-05 11:34:34.000000000 +0200 @@ -29,28 +29,22 @@ #include <xcb/xcb.h> #include <xcb/xcb_aux.h> +#include <xcb/xcb_event.h> + +#include <X11/Xlib-xcb.h> struct SnDisplay { int refcount; - enum SnDisplayType type; - union - { - struct - { - Display *xdisplay; - Screen **screens; - SnDisplayErrorTrapPush push_trap_func; - SnDisplayErrorTrapPop pop_trap_func; - } xlib; - struct - { - xcb_connection_t *xconnection; - xcb_screen_t **screens; - SnXcbDisplayErrorTrapPush push_trap_func; - SnXcbDisplayErrorTrapPop pop_trap_func; - } xcb; - } x; + Display *xdisplay; + xcb_connection_t *xconnection; + xcb_screen_t **screens; + xcb_atom_t UTF8_STRING, NET_STARTUP_ID, + NET_STARTUP_INFO, NET_STARTUP_INFO_BEGIN; + SnDisplayErrorTrapPush push_trap_func; + SnDisplayErrorTrapPop pop_trap_func; + SnXcbDisplayErrorTrapPush xcb_push_trap_func; + SnXcbDisplayErrorTrapPop xcb_pop_trap_func; int n_screens; SnList *xmessage_funcs; SnList *pending_messages; @@ -80,42 +74,31 @@ SnDisplayErrorTrapPush push_trap_func, SnDisplayErrorTrapPop pop_trap_func) { - SnDisplay *display; - int i; - - display = sn_new0 (SnDisplay, 1); + SnDisplay *display = sn_xcb_display_new(XGetXCBConnection(xdisplay), + NULL, NULL); - display->type = SN_DISPLAY_TYPE_XLIB; - display->x.xlib.xdisplay = xdisplay; - display->n_screens = ScreenCount (xdisplay); - display->x.xlib.screens = sn_new (Screen*, display->n_screens); - display->refcount = 1; - - display->x.xlib.push_trap_func = push_trap_func; - display->x.xlib.pop_trap_func = pop_trap_func; - - for (i = 0; i < display->n_screens; ++i) - display->x.xlib.screens[i] = ScreenOfDisplay (display->x.xlib.xdisplay, i); + display->xdisplay = xdisplay; + display->push_trap_func = push_trap_func; + display->pop_trap_func = pop_trap_func; return display; } /** * sn_xcb_display_new: - * @xdisplay: an X window system display + * @xdisplay: an X window system connection * @push_trap_func: function to push an X error trap * @pop_trap_func: function to pop an X error trap * * Creates a new #SnDisplay object, containing - * data that libsn associates with an X display. + * data that libsn associates with an X connection. * * @push_trap_func should be a function that causes X errors to be * ignored until @pop_trap_func is called as many times as * @push_trap_func has been called. (Nested push/pop pairs must be - * supported.) The outermost @pop_trap_func in a set of nested pairs - * must call XSync() to ensure that all errors that will occur have in - * fact occurred. These functions are used to avoid X errors due to - * BadWindow and such. + * supported.) + * These functions are used to avoid X errors due to BadWindow and + * such. * * Return value: the new #SnDisplay **/ @@ -127,19 +110,62 @@ SnDisplay *display; int i; + /* Get all atoms we will need in the future */ + xcb_intern_atom_cookie_t atom_utf8_string_c = + xcb_intern_atom(xconnection, FALSE, + sizeof("UTF8_STRING") - 1, "UTF8_STRING"); + + xcb_intern_atom_cookie_t atom_net_startup_info_begin_c = + xcb_intern_atom(xconnection, FALSE, + sizeof("_NET_STARTUP_INFO_BEGIN") - 1, + "_NET_STARTUP_INFO_BEGIN"); + + xcb_intern_atom_cookie_t atom_net_startup_info_c = + xcb_intern_atom(xconnection, FALSE, + sizeof("_NET_STARTUP_INFO") - 1, "_NET_STARTUP_INFO"); + + xcb_intern_atom_cookie_t atom_net_startup_id_c = + xcb_intern_atom(xconnection, FALSE, + sizeof("_NET_STARTUP_ID") - 1, "_NET_STARTUP_ID"); + display = sn_new0 (SnDisplay, 1); - display->type = SN_DISPLAY_TYPE_XCB; - display->x.xcb.xconnection = xconnection; + display->xconnection = xconnection; display->n_screens = xcb_setup_roots_length (xcb_get_setup (xconnection)); - display->x.xcb.screens = sn_new (xcb_screen_t*, display->n_screens); + display->screens = sn_new (xcb_screen_t*, display->n_screens); display->refcount = 1; - display->x.xcb.push_trap_func = push_trap_func; - display->x.xcb.pop_trap_func = pop_trap_func; - + display->xcb_push_trap_func = push_trap_func; + display->xcb_pop_trap_func = pop_trap_func; + for (i = 0; i < display->n_screens; ++i) - display->x.xcb.screens[i] = xcb_aux_get_screen(xconnection, i); + display->screens[i] = xcb_aux_get_screen(xconnection, i); + + xcb_intern_atom_reply_t *atom_reply; + + atom_reply = xcb_intern_atom_reply(display->xconnection, + atom_utf8_string_c, + NULL); + display->UTF8_STRING = atom_reply->atom; + free(atom_reply); + + atom_reply = xcb_intern_atom_reply(display->xconnection, + atom_net_startup_info_begin_c, + NULL); + display->NET_STARTUP_INFO_BEGIN = atom_reply->atom; + free(atom_reply); + + atom_reply = xcb_intern_atom_reply(display->xconnection, + atom_net_startup_info_c, + NULL); + display->NET_STARTUP_INFO = atom_reply->atom; + free(atom_reply); + + atom_reply = xcb_intern_atom_reply(display->xconnection, + atom_net_startup_id_c, + NULL); + display->NET_STARTUP_ID = atom_reply->atom; + free(atom_reply); return display; } @@ -173,15 +199,7 @@ sn_list_free (display->xmessage_funcs); if (display->pending_messages) sn_list_free (display->pending_messages); - switch (display->type) - { - case SN_DISPLAY_TYPE_XCB: - sn_free (display->x.xcb.screens); - break; - case SN_DISPLAY_TYPE_XLIB: - sn_free (display->x.xlib.screens); - break; - } + sn_free (display->screens); sn_free (display); } } @@ -189,6 +207,8 @@ /** * sn_display_get_x_display: * @display: an #SnDisplay + * This function only returns a value if the SnDisplay + * has been created with sn_display_new(). * * * @@ -197,14 +217,14 @@ Display* sn_display_get_x_display (SnDisplay *display) { - if(display->type == SN_DISPLAY_TYPE_XLIB) - return display->x.xlib.xdisplay; - return NULL; + return display->xdisplay; } /** * sn_display_get_x_connection: * @display: an #SnDisplay + * This function only returns a value if the SnDisplay + * has been created with sn_xcb_display_new(). * * * @@ -213,9 +233,7 @@ xcb_connection_t* sn_display_get_x_connection(SnDisplay *display) { - if(display->type == SN_DISPLAY_TYPE_XCB) - return display->x.xcb.xconnection; - return NULL; + return display->xconnection; } /** @@ -229,14 +247,7 @@ void * sn_internal_display_get_id (SnDisplay *display) { - switch (display->type) - { - case SN_DISPLAY_TYPE_XLIB: - return display->x.xlib.xdisplay; - case SN_DISPLAY_TYPE_XCB: - return display->x.xcb.xconnection; - } - return NULL; + return display->xconnection; } /** @@ -249,14 +260,14 @@ * * Return value: X screen or %NULL **/ -Screen* +xcb_screen_t* sn_internal_display_get_x_screen (SnDisplay *display, int number) { - if (display->type != SN_DISPLAY_TYPE_XLIB || number < 0 || number >= display->n_screens) + if (number < 0 || number >= display->n_screens) return NULL; else - return display->x.xlib.screens[number]; + return display->screens[number]; } /** @@ -269,56 +280,16 @@ * * Return value: X root window or %NULL **/ -Window +xcb_window_t sn_internal_display_get_root_window (SnDisplay *display, int number) { if (number >= 0 && number < display->n_screens) - switch (display->type) - { - case SN_DISPLAY_TYPE_XLIB: - return RootWindow (display->x.xlib.xdisplay, number); - case SN_DISPLAY_TYPE_XCB: - return display->x.xcb.screens[number]->root; - } + return display->screens[number]->root; return None; } /** - * sn_internal_display_get_type - * @display: an #SnDisplay - * - * - * - * Return value: X connection type - */ -enum SnDisplayType -sn_internal_display_get_type (SnDisplay *display) -{ - return display->type; -} - -/** - * sn_internal_display_get_x_screen: - * @display: an #SnDisplay - * @number: screen number to get - * - * Gets a screen by number; if the screen number - * does not exist, returns %NULL. - * - * Return value: X screen or %NULL - **/ -xcb_screen_t* -sn_internal_display_get_xcb_screen (SnDisplay *display, - int number) -{ - if (display->type != SN_DISPLAY_TYPE_XCB || number < 0 || number >= display->n_screens) - return NULL; - else - return display->x.xcb.screens[number]; -} - -/** * sn_internal_display_get_screen_number: * @display an #SnDisplay * @@ -359,9 +330,19 @@ if (sn_internal_monitor_process_event (display)) retval = TRUE; - if (sn_internal_xmessage_process_event (display, xevent)) - retval = TRUE; - + switch(xevent->xany.type) + { + case ClientMessage: + if (sn_internal_xmessage_process_client_message (display, + xevent->xclient.window, + xevent->xclient.message_type, + xevent->xclient.data.b)) + retval = TRUE; + break; + default: + break; + } + return retval; } @@ -392,8 +373,21 @@ if (sn_internal_monitor_process_event (display)) retval = TRUE; - if (sn_xcb_internal_xmessage_process_event (display, xevent)) - retval = TRUE; + switch(XCB_EVENT_RESPONSE_TYPE(xevent)) + { + case XCB_CLIENT_MESSAGE: + { + xcb_client_message_event_t *ev = (xcb_client_message_event_t *) xevent; + if (sn_internal_xmessage_process_client_message (display, + ev->window, + ev->type, + (const char *) ev->data.data8)) + retval = TRUE; + } + break; + default: + break; + } return retval; } @@ -407,16 +401,16 @@ void sn_display_error_trap_push (SnDisplay *display) { - switch (display->type) + /* SnDisplay has been created for Xlib */ + if (display->xdisplay) + { + if (display->push_trap_func) + (* display->push_trap_func) (display, display->xdisplay); + } + else { - case SN_DISPLAY_TYPE_XCB: - if (display->x.xcb.push_trap_func) - (* display->x.xcb.push_trap_func) (display, display->x.xcb.xconnection); - break; - case SN_DISPLAY_TYPE_XLIB: - if (display->x.xlib.push_trap_func) - (* display->x.xlib.push_trap_func) (display, display->x.xlib.xdisplay); - break; + if (display->xcb_push_trap_func) + (* display->xcb_push_trap_func) (display, display->xconnection); } } @@ -429,16 +423,16 @@ void sn_display_error_trap_pop (SnDisplay *display) { - switch (display->type) + /* SnDisplay has been created for Xlib */ + if (display->xdisplay) { - case SN_DISPLAY_TYPE_XCB: - if (display->x.xcb.pop_trap_func) - (* display->x.xcb.pop_trap_func) (display, display->x.xcb.xconnection); - break; - case SN_DISPLAY_TYPE_XLIB: - if (display->x.xlib.pop_trap_func) - (* display->x.xlib.pop_trap_func) (display, display->x.xlib.xdisplay); - break; + if (display->pop_trap_func) + (* display->pop_trap_func) (display, display->xdisplay); + } + else + { + if (display->xcb_pop_trap_func) + (* display->xcb_pop_trap_func) (display, display->xconnection); } } @@ -459,3 +453,26 @@ *pending = display->pending_messages; } +xcb_atom_t +sn_internal_get_utf8_string_atom(SnDisplay *display) +{ + return display->UTF8_STRING; +} + +xcb_atom_t +sn_internal_get_net_startup_id_atom(SnDisplay *display) +{ + return display->NET_STARTUP_ID; +} + +xcb_atom_t +sn_internal_get_net_startup_info_atom(SnDisplay *display) +{ + return display->NET_STARTUP_INFO; +} + +xcb_atom_t +sn_internal_get_net_startup_info_begin_atom(SnDisplay *display) +{ + return display->NET_STARTUP_INFO_BEGIN; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-internals.h new/startup-notification-0.11/libsn/sn-internals.h --- old/startup-notification-0.10/libsn/sn-internals.h 2009-04-03 16:55:50.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-internals.h 2011-05-05 11:34:34.000000000 +0200 @@ -49,31 +49,29 @@ #define NULL ((void*) 0) #endif -enum SnDisplayType -{ - SN_DISPLAY_TYPE_XLIB, - SN_DISPLAY_TYPE_XCB -}; - /* --- From sn-common.c --- */ -Screen* sn_internal_display_get_x_screen (SnDisplay *display, +xcb_screen_t* sn_internal_display_get_x_screen (SnDisplay *display, int number); -Window sn_internal_display_get_root_window (SnDisplay *display, - int number); +xcb_window_t sn_internal_display_get_root_window (SnDisplay *display, + int number); + int sn_internal_display_get_screen_number (SnDisplay *display); void* sn_internal_display_get_id (SnDisplay *display); -xcb_screen_t* sn_internal_display_get_xcb_screen (SnDisplay *display, - int number); - -enum SnDisplayType sn_internal_display_get_type (SnDisplay *display); - void sn_internal_display_get_xmessage_data (SnDisplay *display, SnList **funcs, SnList **pending); +xcb_atom_t sn_internal_get_utf8_string_atom(SnDisplay *display); + +xcb_atom_t sn_internal_get_net_startup_id_atom(SnDisplay *display); + +xcb_atom_t sn_internal_get_net_startup_info_atom(SnDisplay *display); + +xcb_atom_t sn_internal_get_net_startup_info_begin_atom(SnDisplay *display); + /* --- From sn-monitor.c --- */ sn_bool_t sn_internal_monitor_process_event (SnDisplay *display); @@ -95,11 +93,10 @@ const char *append); /* --- From sn-xmessages.c --- */ -sn_bool_t sn_internal_xmessage_process_event (SnDisplay *display, - XEvent *xevent); - -sn_bool_t sn_xcb_internal_xmessage_process_event (SnDisplay *display, - xcb_generic_event_t *xevent); +sn_bool_t sn_internal_xmessage_process_client_message (SnDisplay *display, + xcb_window_t window, + xcb_atom_t type, + const char *data); SN_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-launchee.c new/startup-notification-0.11/libsn/sn-launchee.c --- old/startup-notification-0.10/libsn/sn-launchee.c 2009-04-03 12:11:34.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-launchee.c 2011-05-05 11:34:34.000000000 +0200 @@ -196,8 +196,8 @@ sn_internal_broadcast_xmessage (context->display, context->screen, - "_NET_STARTUP_INFO", - "_NET_STARTUP_INFO_BEGIN", + sn_internal_get_net_startup_info_atom(context->display), + sn_internal_get_net_startup_info_begin_atom(context->display), message); sn_free (message); @@ -217,10 +217,10 @@ **/ void sn_launchee_context_setup_window (SnLauncheeContext *context, - Window xwindow) + xcb_window_t xwindow) { sn_internal_set_utf8_string (context->display, xwindow, - "_NET_STARTUP_ID", + sn_internal_get_net_startup_id_atom(context->display), context->startup_id); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-launchee.h new/startup-notification-0.11/libsn/sn-launchee.h --- old/startup-notification-0.10/libsn/sn-launchee.h 2009-04-03 12:11:34.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-launchee.h 2011-05-05 11:34:34.000000000 +0200 @@ -45,7 +45,7 @@ Time sn_launchee_context_get_timestamp (SnLauncheeContext *context); void sn_launchee_context_complete (SnLauncheeContext *context); void sn_launchee_context_setup_window (SnLauncheeContext *context, - Window xwindow); + xcb_window_t xwindow); SN_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-launcher.c new/startup-notification-0.11/libsn/sn-launcher.c --- old/startup-notification-0.10/libsn/sn-launcher.c 2009-04-03 12:11:34.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-launcher.c 2011-05-05 11:34:34.000000000 +0200 @@ -44,6 +44,7 @@ char *wmclass; char *binary_name; char *icon_name; + char *application_id; struct timeval initiation_time; unsigned int completed : 1; unsigned int canceled : 1; @@ -77,6 +78,7 @@ context->refcount = 1; context->display = display; + context->screen = screen; sn_display_ref (context->display); context->workspace = -1; @@ -121,6 +123,7 @@ sn_free (context->wmclass); sn_free (context->binary_name); sn_free (context->icon_name); + sn_free (context->application_id); sn_display_unref (context->display); sn_free (context); @@ -266,9 +269,16 @@ values[i] = context->icon_name; ++i; } - + + if (context->application_id != NULL) + { + names[i] = "APPLICATION_ID"; + values[i] = context->application_id; + ++i; + } + assert (i < MAX_PROPS); - + names[i] = NULL; values[i] = NULL; @@ -280,8 +290,8 @@ sn_internal_broadcast_xmessage (context->display, context->screen, - "_NET_STARTUP_INFO", - "_NET_STARTUP_INFO_BEGIN", + sn_internal_get_net_startup_info_atom(context->display), + sn_internal_get_net_startup_info_begin_atom(context->display), message); sn_free (message); @@ -312,8 +322,8 @@ sn_internal_broadcast_xmessage (context->display, context->screen, - "_NET_STARTUP_INFO", - "_NET_STARTUP_INFO_BEGIN", + sn_internal_get_net_startup_info_atom(context->display), + sn_internal_get_net_startup_info_begin_atom(context->display), message); sn_free (message); @@ -433,6 +443,16 @@ } void +sn_launcher_set_application_id (SnLauncherContext *context, + const char *desktop_file) +{ + WARN_ALREADY_INITIATED (context); + + sn_free (context->application_id); + context->application_id = sn_internal_strdup (desktop_file); +} + +void sn_launcher_context_set_extra_property (SnLauncherContext *context, const char *name, const char *value) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-launcher.h new/startup-notification-0.11/libsn/sn-launcher.h --- old/startup-notification-0.10/libsn/sn-launcher.h 2009-04-03 12:11:34.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-launcher.h 2010-03-26 14:35:05.000000000 +0100 @@ -61,6 +61,8 @@ const char *name); void sn_launcher_context_set_icon_name (SnLauncherContext *context, const char *name); +void sn_launcher_context_set_application_id (SnLauncherContext *context, + const char *desktop_file); void sn_launcher_context_set_extra_property (SnLauncherContext *context, const char *name, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-monitor.c new/startup-notification-0.11/libsn/sn-monitor.c --- old/startup-notification-0.10/libsn/sn-monitor.c 2009-04-03 12:57:27.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-monitor.c 2011-05-05 11:34:34.000000000 +0200 @@ -66,7 +66,8 @@ Time timestamp; char *binary_name; - char *icon_name; + char *icon_name; + char *application_id; unsigned int completed : 1; unsigned int canceled : 1; @@ -269,7 +270,8 @@ sn_free (sequence->wmclass); sn_free (sequence->binary_name); sn_free (sequence->icon_name); - + sn_free (sequence->application_id); + sn_display_unref (sequence->display); sn_free (sequence); } @@ -337,6 +339,12 @@ return sequence->icon_name; } +const char* +sn_startup_sequence_get_application_id (SnStartupSequence *sequence) +{ + return sequence->application_id; +} + int sn_startup_sequence_get_screen (SnStartupSequence *sequence) { @@ -412,8 +420,8 @@ sn_internal_broadcast_xmessage (sequence->display, sequence->screen, - "_NET_STARTUP_INFO", - "_NET_STARTUP_INFO_BEGIN", + sn_internal_get_net_startup_info_atom(sequence->display), + sn_internal_get_net_startup_info_begin_atom(sequence->display), message); sn_free (message); @@ -805,10 +813,18 @@ changed = TRUE; } } + else if (strcmp (names[i], "APPLICATION_ID") == 0) + { + if (sequence->application_id == NULL) + { + sequence->application_id = sn_internal_strdup (values[i]); + changed = TRUE; + } + } else if (strcmp (names[i], "DESKTOP") == 0) { int workspace; - + workspace = sn_internal_string_to_ulong (values[i]); sequence->workspace = workspace; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-monitor.h new/startup-notification-0.11/libsn/sn-monitor.h --- old/startup-notification-0.10/libsn/sn-monitor.h 2009-04-03 12:11:34.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-monitor.h 2010-03-26 14:35:05.000000000 +0100 @@ -73,6 +73,7 @@ const char* sn_startup_sequence_get_wmclass (SnStartupSequence *sequence); const char* sn_startup_sequence_get_binary_name (SnStartupSequence *sequence); const char* sn_startup_sequence_get_icon_name (SnStartupSequence *sequence); +const char* sn_startup_sequence_get_application_id (SnStartupSequence *sequence); int sn_startup_sequence_get_screen (SnStartupSequence *sequence); void sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-xmessages.c new/startup-notification-0.11/libsn/sn-xmessages.c --- old/startup-notification-0.10/libsn/sn-xmessages.c 2009-04-03 16:56:09.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-xmessages.c 2011-05-05 11:34:34.000000000 +0200 @@ -25,8 +25,6 @@ #include <config.h> -#include <xcb/xcb_event.h> - #include "sn-xmessages.h" #include "sn-list.h" #include "sn-internals.h" @@ -34,9 +32,9 @@ typedef struct { void *xid; - Window root; - Atom type_atom; - Atom type_atom_begin; + xcb_window_t root; + xcb_atom_t type_atom; + xcb_atom_t type_atom_begin; char *message_type; SnXmessageFunc func; void *func_data; @@ -45,8 +43,8 @@ typedef struct { - Atom type_atom_begin; - Window xwindow; + xcb_atom_t type_atom_begin; + xcb_window_t xwindow; char *message; int allocated; } SnXmessage; @@ -63,6 +61,14 @@ SnXmessageHandler *handler; SnList *xmessage_funcs; + xcb_connection_t *c = sn_display_get_x_connection(display); + + /* Send atom requests ASAP */ + xcb_intern_atom_cookie_t message_type_c = + xcb_intern_atom(c, FALSE, strlen(message_type), message_type); + xcb_intern_atom_cookie_t message_type_begin_c = + xcb_intern_atom(c, FALSE, strlen(message_type_begin), message_type_begin); + sn_internal_display_get_xmessage_data (display, &xmessage_funcs, NULL); @@ -70,13 +76,20 @@ handler->xid = sn_internal_display_get_id (display); handler->root = sn_internal_display_get_root_window (display, screen); - handler->type_atom = sn_internal_atom_get (display, message_type); - handler->type_atom_begin = sn_internal_atom_get (display, message_type_begin); handler->message_type = sn_internal_strdup (message_type); handler->func = func; handler->func_data = func_data; handler->free_data_func = free_data_func; + xcb_intern_atom_reply_t *atom_reply; + atom_reply = xcb_intern_atom_reply(c, message_type_c, NULL); + handler->type_atom = atom_reply->atom; + free(atom_reply); + + atom_reply = xcb_intern_atom_reply(c, message_type_begin_c, NULL); + handler->type_atom_begin = atom_reply->atom; + free(atom_reply); + sn_list_prepend (xmessage_funcs, handler); } @@ -85,7 +98,7 @@ const char *message_type; SnXmessageFunc func; void *func_data; - Window root; + xcb_window_t root; SnXmessageHandler *handler; } FindHandlerData; @@ -146,152 +159,73 @@ void sn_internal_broadcast_xmessage (SnDisplay *display, int screen, - const char *message_type, - const char *message_type_begin, + xcb_atom_t message_type, + xcb_atom_t message_type_begin, const char *message) { if (!sn_internal_utf8_validate (message, -1)) - { + { fprintf (stderr, "Attempted to send non-UTF-8 X message: %s\n", message); return; - } - - switch (sn_internal_display_get_type (display)) - { - case SN_DISPLAY_TYPE_XLIB: - { - Atom type_atom; - Atom type_atom_begin; - Window xwindow; - XSetWindowAttributes attrs; - Display *xdisplay = sn_display_get_x_display (display); - - attrs.override_redirect = True; - attrs.event_mask = PropertyChangeMask | StructureNotifyMask; - - xwindow = - XCreateWindow (xdisplay, - RootWindow (xdisplay, 0), - -100, -100, 1, 1, - 0, - CopyFromParent, - CopyFromParent, - CopyFromParent, - CWOverrideRedirect | CWEventMask, - &attrs); - type_atom = sn_internal_atom_get (display, message_type); - type_atom_begin = sn_internal_atom_get (display, message_type_begin); - - { - XEvent xevent; - const char *src; - const char *src_end; - char *dest; - char *dest_end; - - xevent.xclient.type = ClientMessage; - xevent.xclient.message_type = type_atom_begin; - xevent.xclient.display = xdisplay; - xevent.xclient.window = xwindow; - xevent.xclient.format = 8; - - src = message; - src_end = message + strlen (message) + 1; /* +1 to include nul byte */ - - while (src != src_end) - { - dest = &xevent.xclient.data.b[0]; - dest_end = dest + 20; + } + + xcb_connection_t *xconnection = sn_display_get_x_connection (display); - while (dest != dest_end && - src != src_end) - { - *dest = *src; - ++dest; - ++src; - } - - XSendEvent (xdisplay, - RootWindow (xdisplay, screen), - False, - PropertyChangeMask, - &xevent); + uint32_t attrs[] = { 1, XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY }; + xcb_screen_t *s = sn_internal_display_get_x_screen (display, screen); - xevent.xclient.message_type = type_atom; - } - } + xcb_window_t xwindow = xcb_generate_id(xconnection); + xcb_create_window(xconnection, s->root_depth, xwindow, s->root, + -100, -100, 1, 1, 0, XCB_COPY_FROM_PARENT, s->root_visual, + XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK, + attrs); - XDestroyWindow (xdisplay, xwindow); - XFlush (xdisplay); - } - break; - case SN_DISPLAY_TYPE_XCB: - { - xcb_atom_t type_atom; - xcb_atom_t type_atom_begin; - xcb_window_t xwindow; - uint32_t attrs[] = { 1, XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY }; - xcb_connection_t *xconnection = sn_display_get_x_connection (display); - xcb_screen_t *s = sn_internal_display_get_xcb_screen (display, screen); - - xwindow = xcb_generate_id(xconnection); - xcb_create_window(xconnection, s->root_depth, xwindow, s->root, - -100, -100, 1, 1, 0, XCB_COPY_FROM_PARENT, s->root_visual, - XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK, - attrs); + { + xcb_client_message_event_t xevent; + const char *src; + const char *src_end; + unsigned char *dest; + unsigned char *dest_end; + + xevent.response_type = XCB_CLIENT_MESSAGE; + xevent.window = xwindow; + xevent.format = 8; + xevent.type = message_type_begin; - type_atom = sn_internal_atom_get (display, message_type); - type_atom_begin = sn_internal_atom_get (display, message_type_begin); + src = message; + src_end = message + strlen (message) + 1; /* +1 to include nul byte */ + while (src != src_end) { - xcb_client_message_event_t xevent; - const char *src; - const char *src_end; - unsigned char *dest; - unsigned char *dest_end; - - xevent.response_type = XCB_CLIENT_MESSAGE; - xevent.type = type_atom_begin; - xevent.window = xwindow; - xevent.format = 8; + dest = &xevent.data.data8[0]; + dest_end = dest + 20; - src = message; - src_end = message + strlen (message) + 1; /* +1 to include nul byte */ - - while (src != src_end) + while (dest != dest_end && + src != src_end) { - dest = &xevent.data.data8[0]; - dest_end = dest + 20; - - while (dest != dest_end && - src != src_end) - { - *dest = *src; - ++dest; - ++src; - } + *dest = *src; + ++dest; + ++src; + } - xcb_send_event (xconnection, 0, s->root, XCB_EVENT_MASK_PROPERTY_CHANGE, - (char *) &xevent); + xcb_send_event (xconnection, 0, s->root, XCB_EVENT_MASK_PROPERTY_CHANGE, + (char *) &xevent); - xevent.type = type_atom; - } + xevent.type = message_type; } - - xcb_destroy_window (xconnection, xwindow); - xcb_flush(xconnection); - } - break; } + + xcb_destroy_window (xconnection, xwindow); + xcb_flush(xconnection); } typedef struct { void *xid; - Atom atom; - Window xwindow; + xcb_atom_t atom; + xcb_window_t xwindow; sn_bool_t found_handler; } HandlerForAtomData; @@ -315,8 +249,8 @@ static sn_bool_t some_handler_handles_event (SnDisplay *display, - Atom atom, - Window win) + xcb_atom_t atom, + xcb_window_t win) { HandlerForAtomData hfad; SnList *xmessage_funcs; @@ -339,7 +273,7 @@ typedef struct { - Window window; + xcb_window_t window; SnXmessage *message; } FindMessageData; @@ -360,7 +294,7 @@ } static SnXmessage* -message_new(Atom type_atom_begin, Window win) +message_new(xcb_atom_t type_atom_begin, xcb_window_t win) { SnXmessage *message = sn_new0 (SnXmessage, 1); message->type_atom_begin = type_atom_begin; @@ -404,8 +338,8 @@ static SnXmessage* get_or_add_message(SnList *pending_messages, - Window win, - Atom type_atom_begin) + xcb_window_t win, + xcb_atom_t type_atom_begin) { FindMessageData fmd; SnXmessage *message; @@ -431,8 +365,8 @@ static SnXmessage* add_event_to_messages (SnDisplay *display, - Window win, - Atom message_type, + xcb_window_t win, + xcb_atom_t message_type, const char *data) { SnXmessage *message; @@ -532,58 +466,20 @@ } sn_bool_t -sn_internal_xmessage_process_event (SnDisplay *display, - XEvent *xevent) +sn_internal_xmessage_process_client_message (SnDisplay *display, + xcb_window_t window, + xcb_atom_t type, + const char *data) { sn_bool_t retval = FALSE; SnXmessage *message = NULL; - switch (xevent->xany.type) - { - case ClientMessage: - if (some_handler_handles_event (display, - xevent->xclient.message_type, - xevent->xclient.window)) - { - retval = TRUE; - - message = add_event_to_messages (display, - xevent->xclient.window, - xevent->xclient.message_type, - xevent->xclient.data.b); - } - break; - } - - xmessage_process_message (display, message); - - return retval; -} - -sn_bool_t -sn_xcb_internal_xmessage_process_event (SnDisplay *display, - xcb_generic_event_t *xevent) -{ - sn_bool_t retval = FALSE; - SnXmessage *message = NULL; - xcb_client_message_event_t *ev = (xcb_client_message_event_t *) xevent; - - switch (XCB_EVENT_RESPONSE_TYPE(xevent)) - { - case XCB_CLIENT_MESSAGE: - if (some_handler_handles_event (display, - ev->type, - ev->window)) - { - retval = TRUE; + if (some_handler_handles_event (display, type, window)) + { + retval = TRUE; - message = add_event_to_messages (display, - ev->window, - ev->type, - (const char *) ev->data.data8); - } - break; - } + message = add_event_to_messages (display, window, type, data); + } xmessage_process_message (display, message); @@ -599,7 +495,7 @@ int len; char buf[2]; const char *p; - + buf[1] = '\0'; len = 0; escaped = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-xmessages.h new/startup-notification-0.11/libsn/sn-xmessages.h --- old/startup-notification-0.10/libsn/sn-xmessages.h 2009-04-03 12:11:34.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-xmessages.h 2011-05-05 11:34:34.000000000 +0200 @@ -48,8 +48,8 @@ void *func_data); void sn_internal_broadcast_xmessage (SnDisplay *display, int screen, - const char *message_type, - const char *message_type_begin, + xcb_atom_t message_type, + xcb_atom_t message_type_begin, const char *message); char* sn_internal_serialize_message (const char *prefix, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-xutils.c new/startup-notification-0.11/libsn/sn-xutils.c --- old/startup-notification-0.10/libsn/sn-xutils.c 2009-04-03 16:56:27.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-xutils.c 2011-05-05 11:34:34.000000000 +0200 @@ -24,56 +24,26 @@ #include <config.h> #include "sn-internals.h" -#include <X11/Xutil.h> -#include <X11/Xatom.h> #include <xcb/xcb.h> -#include <xcb/xcb_atom.h> - -Atom -sn_internal_atom_get (SnDisplay *display, - const char *atom_name) -{ - switch (sn_internal_display_get_type (display)) - { - case SN_DISPLAY_TYPE_XLIB: - return XInternAtom (sn_display_get_x_display (display), - atom_name, - False); - case SN_DISPLAY_TYPE_XCB: - return xcb_atom_get (sn_display_get_x_connection (display), - atom_name); - } - return None; -} void sn_internal_set_utf8_string (SnDisplay *display, - Window xwindow, - const char *property, + xcb_window_t xwindow, + xcb_atom_t property, const char *str) { sn_display_error_trap_push (display); - switch (sn_internal_display_get_type (display)) - { - case SN_DISPLAY_TYPE_XLIB: - XChangeProperty (sn_display_get_x_display (display), + xcb_connection_t *c = sn_display_get_x_connection (display); + xcb_atom_t UTF8_STRING = sn_internal_get_utf8_string_atom(display); + + xcb_change_property (c, + XCB_PROP_MODE_REPLACE, xwindow, - sn_internal_atom_get (display, property), - sn_internal_atom_get (display, "UTF8_STRING"), - 8, PropModeReplace, (unsigned char*) str, - strlen (str)); - break; - case SN_DISPLAY_TYPE_XCB: - xcb_change_property (sn_display_get_x_connection (display), - XCB_PROP_MODE_REPLACE, - xwindow, - sn_internal_atom_get (display, property), - sn_internal_atom_get (display, "UTF8_STRING"), - 8, strlen (str), str); - break; - } + property, + UTF8_STRING, + 8, strlen (str), str); sn_display_error_trap_pop (display); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/libsn/sn-xutils.h new/startup-notification-0.11/libsn/sn-xutils.h --- old/startup-notification-0.10/libsn/sn-xutils.h 2009-04-03 12:57:27.000000000 +0200 +++ new/startup-notification-0.11/libsn/sn-xutils.h 2011-05-05 11:34:34.000000000 +0200 @@ -29,11 +29,9 @@ SN_BEGIN_DECLS -Atom sn_internal_atom_get (SnDisplay *display, - const char *atom_name); void sn_internal_set_utf8_string (SnDisplay *display, - Window xwindow, - const char *property, + xcb_window_t xwindow, + xcb_atom_t property, const char *str); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/missing new/startup-notification-0.11/missing --- old/startup-notification-0.10/missing 2009-04-12 09:29:12.000000000 +0200 +++ new/startup-notification-0.11/missing 2010-01-18 07:28:57.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/test/Makefile.am new/startup-notification-0.11/test/Makefile.am --- old/startup-notification-0.10/test/Makefile.am 2009-04-03 16:56:51.000000000 +0200 +++ new/startup-notification-0.11/test/Makefile.am 2010-03-15 15:18:07.000000000 +0100 @@ -16,7 +16,7 @@ test-launcher-xcb \ test-watch-xmessages-xcb -noinst_PROGRAMS=$(XLIB_TEST) $(XCB_TEST) +check_PROGRAMS=$(XLIB_TEST) $(XCB_TEST) test_launcher_SOURCES= test-launcher.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/test/test-launcher-xcb.c new/startup-notification-0.11/test/test-launcher-xcb.c --- old/startup-notification-0.10/test/test-launcher-xcb.c 2009-04-03 12:59:56.000000000 +0200 +++ new/startup-notification-0.11/test/test-launcher-xcb.c 2011-05-05 11:34:34.000000000 +0200 @@ -64,7 +64,7 @@ name = "Fake Window"; xcb_change_property (xconnection, XCB_PROP_MODE_REPLACE, - xwindow, WM_NAME, STRING, 8, + xwindow, XCB_ATOM_WM_NAME, XCB_ATOM_STRING, 8, strlen (name), name); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/startup-notification-0.10/test/test-launcher.c new/startup-notification-0.11/test/test-launcher.c --- old/startup-notification-0.10/test/test-launcher.c 2009-04-03 14:31:42.000000000 +0200 +++ new/startup-notification-0.11/test/test-launcher.c 2011-05-05 11:34:34.000000000 +0200 @@ -25,6 +25,7 @@ #include <config.h> #include <libsn/sn.h> #include <assert.h> +#include <X11/Xatom.h> #include "test-boilerplate.h" @@ -45,8 +46,6 @@ { XSetWindowAttributes attrs; - Atom atom_name; - Atom atom_type; char* name; attrs.override_redirect = True; @@ -63,15 +62,10 @@ CWOverrideRedirect | CWEventMask, &attrs); - atom_name = XInternAtom (xdisplay, "WM_NAME", TRUE); - assert (atom_name != None); - atom_type = XInternAtom (xdisplay, "STRING", TRUE); - assert (atom_type != None); - name = "Fake Window"; XChangeProperty (xdisplay, - xwindow, atom_name, - atom_type, + xwindow, XA_WM_NAME, + XA_STRING, 8, PropModeReplace, name, strlen (name)); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-shell-extensions for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package gnome-shell-extensions for openSUSE:Factory checked in at Tue May 10 09:53:28 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-shell-extensions/gnome-shell-extensions.changes 2011-04-30 18:03:47.000000000 +0200 @@ -0,0 +1,34 @@ +------------------------------------------------------------------- +Sat Apr 30 15:42:10 UTC 2011 - malcolmlewis(a)opensuse.org + +- Update based on git commit f016b95 (which is nearly 3.0.1): + + Add drive-menu extension. + +------------------------------------------------------------------- +Thu Apr 28 23:22:32 CEST 2011 - vuntz(a)opensuse.org + +- Remove fdupes BuildRequires and call to %fdupes as we package + each extension in its own subpackage. + +------------------------------------------------------------------- +Thu Apr 28 16:13:25 UTC 2011 - malcolmlewis(a)opensuse.org + +- Update based on git commit b223396 (which is nearly 3.0.1): + + Add Alternative Status Menu extension + + Add Gajim extension + + Add user-theme extension + + AlternateTab: make it work with the mouse + + AutoMoveWindows: modify workspace management to only remove + empty workspaces at end. + + Dock: lower the actor to the bottom. + + windowsNavigator: + - support current gnome-shell + - correct restore focus +- Split out extensions into subpackages, with + gnome-shell-extensions having a Recommends for each of them. + +------------------------------------------------------------------- +Tue Feb 22 20:39:45 UTC 2011 - dimstar(a)opensuse.org + +- Initial package, based on git commit b289b0f. + calling whatdependson for head-i586 New: ---- README.SUSE gnome-shell-extensions.changes gnome-shell-extensions.spec gnome-shell-extensions.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell-extensions.spec ++++++ # # spec file for package gnome-shell-extensions # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands # # 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: gnome-shell-extensions Version: 3.0.1 Release: 1 # git show-ref HEAD # f016b95f772f7ca3947ecee7dc2cea55a15e5138 refs/remotes/origin/HEAD License: GPLv2+ Summary: A collection of extensions for GNOME Shell Url: http://live.gnome.org/GnomeShell/Extensions Group: System/GUI/GNOME Source: %{name}.tar.bz2 Source1: README.SUSE # Needed because we build from a git checkout BuildRequires: gnome-common # Needed for directory ownership BuildRequires: gnome-shell BuildRequires: pkgconfig(gnome-desktop-3.0) Requires: gnome-shell Recommends: gnome-shell-extension-alt-status-menu Recommends: gnome-shell-extension-alternate-tab Recommends: gnome-shell-extension-auto-move-windows Recommends: gnome-shell-extension-dock Recommends: gnome-shell-extension-drive-menu Recommends: gnome-shell-extension-gajim Recommends: gnome-shell-extension-user-theme Recommends: gnome-shell-extension-windows-navigator Recommends: gnome-shell-extension-xrandr-indicator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description GNOME Shell Extensions is a collection of extensions providing additional and optional functionality to GNOME Shell. %package -n gnome-shell-extension-alt-status-menu Summary: GNOME Shell Extension -- Power Off Item in Status Menu Group: System/GUI/GNOME License: GPLv2+ Requires: gnome-shell Recommends: %{name}-lang %description -n gnome-shell-extension-alt-status-menu This GNOME Shell extension adds a power off item in the status menu, and provides the ability to hibernate. %package -n gnome-shell-extension-alternate-tab Summary: GNOME Shell Extension -- Classic Alt+Tab behavior Group: System/GUI/GNOME License: GPLv2+ Requires: gnome-shell Recommends: %{name}-lang %description -n gnome-shell-extension-alternate-tab This GNOME Shell extension changes Alt+Tab to be window-based instead of app-based. %package -n gnome-shell-extension-auto-move-windows Summary: GNOME Shell Extension -- Assign specific workspaces to applications Group: System/GUI/GNOME License: GPLv2+ Requires: gnome-shell Recommends: %{name}-lang %glib2_gsettings_schema_requires %description -n gnome-shell-extension-auto-move-windows This GNOME Shell extension enables easy workspace management. A specific workspace can be assigned to each application as soon as it creates a window, in a manner configurable with a GSettings key. %package -n gnome-shell-extension-dock Summary: GNOME Shell Extension -- Dock-style Task Switcher Group: System/GUI/GNOME License: GPLv2+ Requires: gnome-shell Recommends: %{name}-lang %description -n gnome-shell-extension-dock This GNOME Shell extension displays a dock-style task switcher on the right side of the screen. %package -n gnome-shell-extension-drive-menu Summary: GNOME Shell Extension -- Drive status menu Group: System/GUI/GNOME License: GPLv2+ Requires: gnome-shell Recommends: %{name}-lang %description -n gnome-shell-extension-drive-menu This GNOME Shell extension provides a panel status menu for accessing and unmounting removable devices. %package -n gnome-shell-extension-gajim Summary: GNOME Shell Extension -- Gajim Integration Group: System/GUI/GNOME License: GPLv2+ Requires: gnome-shell Recommends: %{name}-lang %description -n gnome-shell-extension-gajim This GNOME Shell extension adds integration with the Gajim instant messaging client. %package -n gnome-shell-extension-user-theme Summary: GNOME Shell Extension -- Support for Custom Themes Group: System/GUI/GNOME License: GPLv2+ Requires: gnome-shell Recommends: %{name}-lang %glib2_gsettings_schema_requires %description -n gnome-shell-extension-user-theme This GNOME Shell extension enables loading a GNOME Shell theme from ~/.themes/<name>/gnome-shell. %package -n gnome-shell-extension-windows-navigator Summary: GNOME Shell Extension -- Keyboard Selection of Windows and Workspaces Group: System/GUI/GNOME License: GPLv2+ Requires: gnome-shell Recommends: %{name}-lang %description -n gnome-shell-extension-windows-navigator This GNOME Shell extension enables keyboard selection of windows and workspaces in overlay mode, by pressing the alt key. %package -n gnome-shell-extension-xrandr-indicator Summary: GNOME Shell Extension -- Status Menu for Rotating Monitors Group: System/GUI/GNOME License: GPLv2+ Requires: gnome-shell Recommends: %{name}-lang %description -n gnome-shell-extension-xrandr-indicator This GNOME Shell extension adds a status menu to let rotate the laptop monitor and open display preferences quickly. %lang_package %prep %setup -q -n %{name} cp %{S:1} . %build # Needed because we build from a git checkout [ -x autogen.sh ] && NOCONFIGURE=1 ./autogen.sh %configure --enable-extensions=all make %{?_smp_mflags} %install %make_install # Remove example extension rm -r %{buildroot}%{_datadir}/gnome-shell/extensions/example(a)gnome-shell-extensions.gnome.org/ %find_lang %{name} %{?no_lang_C} %clean %{?buildroot:%__rm -rf %{buildroot}} %post -n gnome-shell-extension-auto-move-windows %glib2_gsettings_schema_post %postun -n gnome-shell-extension-auto-move-windows %glib2_gsettings_schema_postun %post -n gnome-shell-extension-user-theme %glib2_gsettings_schema_post %postun -n gnome-shell-extension-user-theme %glib2_gsettings_schema_postun %files %defattr(-,root,root) %doc README README.SUSE %files -n gnome-shell-extension-alt-status-menu %defattr(-,root,root) %{_datadir}/gnome-shell/extensions/alternative-status-menu(a)gnome-shell-extensions.gnome.org/ %files -n gnome-shell-extension-alternate-tab %defattr(-,root,root) %{_datadir}/gnome-shell/extensions/alternate-tab(a)gnome-shell-extensions.gnome.org/ %files -n gnome-shell-extension-auto-move-windows %defattr(-,root,root) %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml %{_datadir}/gnome-shell/extensions/auto-move-windows(a)gnome-shell-extensions.gnome.org/ %files -n gnome-shell-extension-dock %defattr(-,root,root) %{_datadir}/gnome-shell/extensions/dock(a)gnome-shell-extensions.gnome.org/ %files -n gnome-shell-extension-drive-menu %defattr(-,root,root) %{_datadir}/gnome-shell/extensions/drive-menu(a)gnome-shell-extensions.gnome.org/ %files -n gnome-shell-extension-gajim %defattr(-,root,root) %{_datadir}/gnome-shell/extensions/gajim(a)gnome-shell-extensions.gnome.org/ %files -n gnome-shell-extension-user-theme %defattr(-,root,root) %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml %{_datadir}/gnome-shell/extensions/user-theme(a)gnome-shell-extensions.gnome.org/ %files -n gnome-shell-extension-windows-navigator %defattr(-,root,root) %{_datadir}/gnome-shell/extensions/windowsNavigator(a)gnome-shell-extensions.gnome.org/ %files -n gnome-shell-extension-xrandr-indicator %defattr(-,root,root) %{_datadir}/gnome-shell/extensions/xrandr-indicator(a)gnome-shell-extensions.gnome.org/ %files lang -f %{name}.lang %changelog ++++++ README.SUSE ++++++ The gnome-shell-extensions package is a meta-package recommending subpackages for separate installation. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-HTTP-Body for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package perl-HTTP-Body for openSUSE:Factory checked in at Tue May 10 09:19:30 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-HTTP-Body/perl-HTTP-Body.changes 2010-12-01 14:46:47.000000000 +0100 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 1 13:32:55 UTC 2010 - coolo(a)novell.com + +- switch to perl_requires macro + +------------------------------------------------------------------- +Mon Sep 20 04:03:44 UTC 2010 - dbahi(a)novell.com + +- initial package 1.09 + * created by cpanspec 1.78 + calling whatdependson for head-i586 New: ---- HTTP-Body-1.09.tar.bz2 perl-HTTP-Body.changes perl-HTTP-Body.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTTP-Body.spec ++++++ # # spec file for package perl-HTTP-Body # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: perl-HTTP-Body %define cpan_name HTTP-Body Summary: HTTP Body Parser Version: 1.09 Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/HTTP-Body/ #Source: http://www.cpan.org/authors/id/E/EL/ELLIOTT/HTTP-Body-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Carp) BuildRequires: perl(File::Temp) >= 0.14 BuildRequires: perl(HTTP::Headers) BuildRequires: perl(IO::File) >= 1.14 BuildRequires: perl(Test::Deep) Requires: perl(Carp) Requires: perl(File::Temp) >= 0.14 Requires: perl(HTTP::Headers) Requires: perl(IO::File) >= 1.14 %description HTTP::Body parses chunks of HTTP POST data and supports application/octet- stream, application/x-www-form-urlencoded, and multipart/form-data. %prep %setup -q -n %{cpan_name}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %install %perl_make_install # do not perl_process_packlist (noarch) # remove .packlist file %{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch # remove perllocal.pod file %{__rm} -rf $RPM_BUILD_ROOT%perl_archlib %perl_gen_filelist %clean %{__rm} -rf $RPM_BUILD_ROOT %files -f %{name}.files %defattr(-,root,root,-) %doc Changes dist.ini LICENSE README scripts %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-HTTP-Request-AsCGI for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package perl-HTTP-Request-AsCGI for openSUSE:Factory checked in at Tue May 10 09:18:19 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-HTTP-Request-AsCGI/perl-HTTP-Request-AsCGI.changes 2010-12-01 14:46:54.000000000 +0100 @@ -0,0 +1,15 @@ +------------------------------------------------------------------- +Wed Dec 1 13:32:57 UTC 2010 - coolo(a)novell.com + +- switch to perl_requires macro + +------------------------------------------------------------------- +Mon Nov 29 18:00:28 UTC 2010 - coolo(a)novell.com + +- called spec2changelog + +------------------------------------------------------------------- +Tue Jan 12 00:00:00 UTC 2010 - nine(a)detonation.org + +- Specfile autogenerated by cpanspec 1.78. + calling whatdependson for head-i586 New: ---- HTTP-Request-AsCGI-1.0.tar.gz perl-HTTP-Request-AsCGI.changes perl-HTTP-Request-AsCGI.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTTP-Request-AsCGI.spec ++++++ # # spec file for package perl-HTTP-Request-AsCGI # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: perl-HTTP-Request-AsCGI Version: 1.0 Release: 1 Summary: Set up a CGI environment from an HTTP::Request License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/HTTP-Request-AsCGI/ Source0: http://www.cpan.org/modules/by-module/HTTP/HTTP-Request-AsCGI-%{version}.ta… BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} BuildArch: noarch BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Carp) BuildRequires: perl(Class::Accessor) BuildRequires: perl(HTTP::Request) BuildRequires: perl(HTTP::Response) >= 1.53 BuildRequires: perl(IO::File) BuildRequires: perl(URI::Escape) Requires: perl(Carp) Requires: perl(Class::Accessor) Requires: perl(HTTP::Request) Requires: perl(HTTP::Response) >= 1.53 Requires: perl(IO::File) Requires: perl(URI::Escape) %description Provides a convenient way of setting up an CGI environment from an HTTP::Request. %prep %setup -q -n HTTP-Request-AsCGI-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes dist.ini examples LICENSE README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Mixin-Linewise for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package perl-Mixin-Linewise for openSUSE:Factory checked in at Tue May 10 09:17:24 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Mixin-Linewise/perl-Mixin-Linewise.changes 2011-01-17 17:27:19.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Mon Jan 17 16:27:03 UTC 2011 - coolo(a)novell.com + +- initial package 0.003 + * created by cpanspec 1.78.03 + calling whatdependson for head-i586 New: ---- Mixin-Linewise-0.003.tar.bz2 perl-Mixin-Linewise.changes perl-Mixin-Linewise.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Mixin-Linewise.spec ++++++ # # spec file for package perl-Mixin-Linewise # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: perl-Mixin-Linewise Version: 0.003 Release: 1 License: GPL+ or Artistic %define cpan_name Mixin-Linewise Summary: write your linewise code for handles; this does the rest Url: http://search.cpan.org/dist/Mixin-Linewise/ Group: Development/Libraries/Perl #Source: http://www.cpan.org/authors/id/R/RJ/RJBS/Mixin-Linewise-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.bz2 BuildRequires: perl(Carp) BuildRequires: perl(IO::File) BuildRequires: perl(IO::String) BuildRequires: perl(Sub::Exporter) >= 0.9 BuildRequires: perl BuildRequires: perl-macros Requires: perl(Carp) Requires: perl(IO::File) Requires: perl(IO::String) Requires: perl(Sub::Exporter) >= 0.9 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %{perl_requires} %description It's boring to deal with opening files for IO, converting strings to handle-like objects, and all that. With the Mixin::Linewise::Readers manpage and the Mixin::Linewise::Writers manpage, you can just write a method to handle handles, and methods for handling strings and filenames are added for you. %prep %setup -q -n %{cpan_name}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %install %perl_make_install %perl_process_packlist %perl_gen_filelist %clean %{__rm} -rf %{buildroot} %files -f %{name}.files %defattr(644,root,root,755) %doc Changes LICENSE README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit exim for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package exim for openSUSE:Factory checked in at Tue May 10 09:16:06 CEST 2011. -------- --- exim/exim.changes 2011-05-07 15:33:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/exim/exim.changes 2011-05-09 13:33:14.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 9 13:32:55 CEST 2011 - dmueller(a)suse.de + +- check format strings + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- format-security.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exim.spec ++++++ --- /var/tmp/diff_new_pack.gM2RXA/_old 2011-05-10 09:15:14.000000000 +0200 +++ /var/tmp/diff_new_pack.gM2RXA/_new 2011-05-10 09:15:14.000000000 +0200 @@ -41,7 +41,7 @@ PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd fileutils textutils %endif Version: 4.75 -Release: 1 +Release: 3 %if %{?build_with_mysql:1}0 BuildRequires: mysql-devel Provides: exim = %version @@ -63,6 +63,7 @@ Source31: eximstats.conf Patch: exim-4.12-tail.patch Patch1: 109066729a54f6ba5c4e8bc174133da33242e930.diff +Patch2: format-security.diff %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %package -n eximon @@ -130,6 +131,7 @@ %setup -q -n exim-%{version} %patch %patch1 -p2 +%patch2 # build with fPIE/pie on SUSE 10.0 or newer, or on any other platform %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930 fPIE="-fPIE" @@ -241,7 +243,7 @@ # SPOOL_MODE=0640 SUPPORT_MOVE_FROZEN_MESSAGES=yes HAVE_IPV6=YES - CFLAGS=$RPM_OPT_FLAGS -Wall -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLDAP_DEPRECATED $fPIE + CFLAGS=$RPM_OPT_FLAGS -Wall -Werror=format-security -Werror=missing-format-attribute -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLDAP_DEPRECATED $fPIE EXTRALIBS=-ldl -L/usr/X11R6/%{_lib} $pie EOF touch Local/eximon.conf ++++++ format-security.diff ++++++ --- exim_monitor/em_log.c +++ exim_monitor/em_log.c @@ -58,6 +58,8 @@ static int size = 0; static int top = 0; +static void show_log(char *s, ...) PRINTF_FUNCTION(1,2); + static void show_log(char *s, ...) { int length, newtop; @@ -364,7 +366,7 @@ if (log_datestamping) { uschar log_file_wanted[256]; - string_format(log_file_wanted, sizeof(log_file_wanted), CS log_file); + string_format(log_file_wanted, sizeof(log_file_wanted), "%s", CS log_file); if (Ustrcmp(log_file_wanted, log_file_open) != 0) { if (LOG != NULL) --- exim_monitor/em_main.c +++ exim_monitor/em_main.c @@ -656,7 +656,7 @@ if (log_file[0] != 0) { - (void)string_format(log_file_open, sizeof(log_file_open), CS log_file); + (void)string_format(log_file_open, sizeof(log_file_open), "%s", CS log_file); log_datestamping = string_datestamp_offset >= 0; LOG = fopen(CS log_file_open, "r"); --- exim_monitor/em_text.c +++ exim_monitor/em_text.c @@ -60,6 +60,8 @@ * Display text from format * *************************************************/ +void text_showf(Widget w, char *s, ...) PRINTF_FUNCTION(2,3); + void text_showf(Widget w, char *s, ...) { va_list ap; --- src/demime.c +++ src/demime.c @@ -823,7 +823,7 @@ (void)string_vformat(US f, 16383,(char *)format, ap); va_end(ap); f-=22; - log_write(0, LOG_MAIN, f); + log_write(0, LOG_MAIN, "%s", f); /* then copy to demime_reason_buffer if new level is greater than old level */ if (level > demime_errorlevel) { --- src/dkim.c +++ src/dkim.c @@ -176,7 +176,7 @@ } logmsg[ptr] = '\0'; - log_write(0, LOG_MAIN, (char *)logmsg); + log_write(0, LOG_MAIN, "%s", (char *)logmsg); /* Build a colon-separated list of signing domains (and identities, if present) in dkim_signers */ dkim_signers = string_append(dkim_signers, --- src/exim_dbutil.c +++ src/exim_dbutil.c @@ -59,6 +59,7 @@ #include "dbstuff.h" #include "osfunctions.h" #include "store.h" +#include "local_scan.h" /* Identifiers for the different database types. */ --- src/functions.h +++ src/functions.h @@ -82,7 +82,7 @@ int, int, uschar *, bit_table *, int, uschar *, int); extern address_item *deliver_make_addr(uschar *, BOOL); extern int deliver_message(uschar *, BOOL, BOOL); -extern void deliver_msglog(const char *, ...); +extern void deliver_msglog(const char *, ...) PRINTF_FUNCTION(1,2); extern void deliver_set_expansions(address_item *); extern int deliver_split_address(address_item *); extern void deliver_succeeded(address_item *); @@ -181,9 +181,9 @@ extern uschar *moan_check_errorcopy(uschar *); extern BOOL moan_skipped_syntax_errors(uschar *, error_block *, uschar *, BOOL, uschar *); -extern void moan_smtp_batch(uschar *, char *, ...); +extern void moan_smtp_batch(uschar *, char *, ...) PRINTF_FUNCTION(2,3); extern void moan_tell_someone(uschar *, address_item *, uschar *, char *, - ...); + ...) PRINTF_FUNCTION(4,5); extern BOOL moan_to_sender(int, error_block *, header_line *, FILE *, BOOL); extern void moan_write_from(FILE *); extern FILE *modefopen(uschar *, char *, mode_t); @@ -271,7 +271,7 @@ int *); extern void *search_open(uschar *, int, int, uid_t *, gid_t *); extern void search_tidyup(void); -extern void set_process_info(char *, ...); +extern void set_process_info(char *, ...) PRINTF_FUNCTION(1,2); extern void sha1_end(sha1 *, const uschar *, int, uschar *); extern void sha1_mid(sha1 *, const uschar *); extern void sha1_start(sha1 *); @@ -299,7 +299,7 @@ extern BOOL smtp_start_session(void); extern int smtp_ungetc(int); extern BOOL smtp_verify_helo(void); -extern int smtp_write_command(smtp_outblock *, BOOL, char *, ...); +extern int smtp_write_command(smtp_outblock *, BOOL, char *, ...) PRINTF_FUNCTION(3,4); #ifdef WITH_CONTENT_SCAN extern int spam(uschar **); extern FILE *spool_mbox(unsigned long *, uschar *); @@ -321,13 +321,13 @@ extern uschar *string_copylc(uschar *); extern uschar *string_copynlc(uschar *, int); extern uschar *string_dequote(uschar **); -extern BOOL string_format(uschar *, int, char *, ...); +extern BOOL string_format(uschar *, int, char *, ...) PRINTF_FUNCTION(3,4); extern uschar *string_format_size(int, uschar *); extern int string_interpret_escape(uschar **); extern int string_is_ip_address(uschar *, int *); extern uschar *string_log_address(address_item *, BOOL, BOOL); extern uschar *string_nextinlist(uschar **, int *, uschar *, int); -extern uschar *string_open_failed(int, char *, ...); +extern uschar *string_open_failed(int, char *, ...) PRINTF_FUNCTION(2,3); extern uschar *string_printing2(uschar *, BOOL); extern uschar *string_split_message(uschar *); extern BOOL string_vformat(uschar *, int, char *, va_list); --- src/local_scan.h +++ src/local_scan.h @@ -175,7 +175,7 @@ extern void header_remove(int, uschar *); extern BOOL header_testname(header_line *, uschar *, int, BOOL); extern BOOL header_testname_incomplete(header_line *, uschar *, int, BOOL); -extern void log_write(unsigned int, int, char *format, ...); +extern void log_write(unsigned int, int, char *format, ...) PRINTF_FUNCTION(3,4); extern int lss_b64decode(uschar *, uschar **); extern uschar *lss_b64encode(uschar *, int); extern int lss_match_domain(uschar *, uschar *); @@ -190,6 +190,6 @@ extern void smtp_vprintf(char *, va_list); extern uschar *string_copy(uschar *); extern uschar *string_copyn(uschar *, int); -extern uschar *string_sprintf(char *, ...); +extern uschar *string_sprintf(char *, ...) PRINTF_FUNCTION(1,2); /* End of local_scan.h */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit microcode_ctl for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package microcode_ctl for openSUSE:Factory checked in at Tue May 10 09:15:04 CEST 2011. -------- --- microcode_ctl/microcode_ctl.changes 2011-01-18 15:20:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/microcode_ctl/microcode_ctl.changes 2011-05-10 04:05:58.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 10 02:04:01 UTC 2011 - crrodriguez(a)opensuse.org + +- microcode.init, do not load microcode on Virtual Machines + ugly error messages shown in syslog otherwise. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ microcode_ctl.spec ++++++ --- /var/tmp/diff_new_pack.UfsFyT/_old 2011-05-10 09:14:47.000000000 +0200 +++ /var/tmp/diff_new_pack.UfsFyT/_new 2011-05-10 09:14:47.000000000 +0200 @@ -27,7 +27,7 @@ Group: Hardware/Other Summary: Microcode Updates for Intel CPUs Version: 1.17 -Release: 117 +Release: 123 Source0: microcode_ctl-%{version}.tar.bz2 Source1: microcode.init Source2: microcode-%{intel_version}.dat.bz2 ++++++ microcode.init ++++++ --- /var/tmp/diff_new_pack.UfsFyT/_old 2011-05-10 09:14:48.000000000 +0200 +++ /var/tmp/diff_new_pack.UfsFyT/_new 2011-05-10 09:14:48.000000000 +0200 @@ -24,7 +24,12 @@ do_start() { echo -n "Checking/updating CPU microcode " - if grep -q -i intel /proc/cpuinfo \ + + if test -x /usr/sbin/dmidecode \ + && /usr/sbin/dmidecode -s system-product-name \ + | grep -q -i -P "\b(?:VirtualBox|VMware|Bochs|Parallels|Qemu)\b"; then + rc_status -u + elif grep -q -i intel /proc/cpuinfo \ && /sbin/modinfo microcode >& /dev/null; then /sbin/modprobe -q microcode /sbin/microcode_ctl -Qu ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit osc-source_validator for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package osc-source_validator for openSUSE:Factory checked in at Tue May 10 09:14:30 CEST 2011. -------- --- osc-source_validator/osc-source_validator.changes 2011-04-18 01:07:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes 2011-05-09 15:47:38.000000000 +0200 @@ -1,0 +2,11 @@ +Mon May 9 13:47:29 UTC 2011 - ro(a)novell.com + +- try to fix bnc#679980 + +------------------------------------------------------------------- +Wed Apr 20 17:30:19 CEST 2011 - ro(a)suse.de + +- find another form of commenting out patches + in check_patches_applied + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc-source_validator.spec ++++++ --- /var/tmp/diff_new_pack.o6DrKj/_old 2011-05-10 09:13:53.000000000 +0200 +++ /var/tmp/diff_new_pack.o6DrKj/_new 2011-05-10 09:13:53.000000000 +0200 @@ -19,7 +19,7 @@ Name: osc-source_validator Version: 0.1 -Release: 14 +Release: 16 License: GPLv2+ Summary: osc source validator Url: http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator ++++++ osc-source_validator-0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-source_validator-0.1/20-files-present-and-referenced new/osc-source_validator-0.1/20-files-present-and-referenced --- old/osc-source_validator-0.1/20-files-present-and-referenced 2011-04-18 01:02:49.000000000 +0200 +++ new/osc-source_validator-0.1/20-files-present-and-referenced 2011-05-09 15:45:41.000000000 +0200 @@ -96,9 +96,10 @@ /^Supplements/d /^Suggests/d /^Enhances/d - s/^$[Ss]ource\|[Pp]atch$[0-9]*:[ ]*/%{echo:/ - s/^Release:.*<RELEASE.*>/Release: 0/ - /^%{echo:/s/$/ }/' $i >$TMPDIR/tmp.spec + /^$[Ss]ource\|[Pp]atch$[0-9]*:[ ]*/{ + s/^$\([Ss]ource\|[Pp]atch$[0-9]*:[ ]*\)$.*$/##seen \1\3\n%{echo:\3 }/ + } + s/^Release:.*<RELEASE.*>/Release: 0/' $i >$TMPDIR/tmp.spec grep -a ^Icon: $i|sed -n 's/^Icon:[ ]*/%{echo:/ /^%{echo:/s/$/ }/p' >>$TMPDIR/tmp.spec grep -a -q ^Release $i || { @@ -109,6 +110,9 @@ -gt `grep -a "^%endif" $TMPDIR/tmp.spec | wc -l` ; do echo "%endif" >> $TMPDIR/tmp.spec done + while read line ; do + grep -qx "##seen $line" $TMPDIR/tmp.spec || echo "$line" | sed -e "s/^$\([Ss]ource\|[Pp]atch$[0-9]*:[ ]*\)$.*$/##seen \1\3\n%{echo:\3 }/" >> $TMPDIR/tmp.spec + done < <(grep -E "^Source:|^Source[0-9]*:|^Patch:|^Patch[0-9]*:" $i) echo "%description" >> $TMPDIR/tmp.spec # hack for really strange specfiles with more than one Name: line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-source_validator-0.1/helpers/check_patches_applied new/osc-source_validator-0.1/helpers/check_patches_applied --- old/osc-source_validator-0.1/helpers/check_patches_applied 2011-04-18 01:02:49.000000000 +0200 +++ new/osc-source_validator-0.1/helpers/check_patches_applied 2011-05-09 15:45:41.000000000 +0200 @@ -37,7 +37,7 @@ $PATCHES_COMMENTED[$front] = 1 if $commented; next; } - if (/^(#.*)?%[Pp]atch/) { + if (/^(#.*)?%[Pp]atch/ || /^#[Pp]atch/) { my $applied = (/^#/) ? 2 :1; my @line = split (/\s+/,$_); my $had_P = grep {/^-P/} @line; @@ -64,8 +64,8 @@ $arg = 0; $APPLIED[$arg] = $applied unless $APPLIED[$arg]; } - } elsif ($arg =~ /^(#.*)?%[Pp]atch/) { - $arg =~ s/^(#.*)?%[Pp]atch//; + } elsif ($arg =~ /^(#.*)?%?[Pp]atch/) { + $arg =~ s/^(#.*)?%?[Pp]atch//; if ($arg =~ /^[0-9]/) { $APPLIED[$arg] = $applied unless $APPLIED[$arg]; } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0