Mailinglist Archive: opensuse-commit (926 mails)

< Previous Next >
commit gnome-screensaver for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 08 Dec 2009 10:40:32 +0100
  • Message-id: <20091208094032.B8A9C20298@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package gnome-screensaver for
openSUSE:Factory
checked in at Tue Dec 8 10:40:32 CET 2009.



--------
--- GNOME/gnome-screensaver/gnome-screensaver.changes 2009-09-24
11:26:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-screensaver/gnome-screensaver.changes
2009-12-03 10:57:59.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 3 10:57:45 CET 2009 - vuntz@xxxxxxxxxxxx
+
+- Rebase gnome-screensaver-finger-print.patch to apply without
+ fuzz.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.eFC2WH/_old 2009-12-08 10:39:31.000000000 +0100
+++ /var/tmp/diff_new_pack.eFC2WH/_new 2009-12-08 10:39:31.000000000 +0100
@@ -34,10 +34,10 @@
BuildRequires: update-desktop-files
BuildRequires: xscreensaver
Version: 2.28.0
-Release: 1
+Release: 2
Url: http://www.gnome.org/
Group: System/GUI/GNOME
-License: GPL v2 or later
+License: GPLv2+
Summary: GNOME Screen Saver and Locker
Source:
ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
Source1: xscreensaver-blacklist
@@ -67,12 +67,6 @@

* User switching

-
-
-Authors:
---------
- William Jon McCann <mccann@xxxxxxx>
-
%lang_package
%prep
%setup -q
@@ -151,8 +145,6 @@
%dir %{_datadir}/applications/screensavers
# FIXME: Maybe bad directory ownership:
%dir %{_datadir}/backgrounds
-# FIXME: Directory ownership:
-#%dir %{_sysconfdir}/xdg/menus

%files lang -f %{name}.lang


++++++ gnome-screensaver-finger-print.patch ++++++
--- /var/tmp/diff_new_pack.eFC2WH/_old 2009-12-08 10:39:31.000000000 +0100
+++ /var/tmp/diff_new_pack.eFC2WH/_new 2009-12-08 10:39:31.000000000 +0100
@@ -2,9 +2,7 @@
===================================================================
--- configure.ac.orig
+++ configure.ac
-@@ -915,10 +915,25 @@ if test "x$have_libnotify" = "xyes"; the
- AC_SUBST(LIBNOTIFY_LIBS)
- AC_DEFINE(WITH_LIBNOTIFY, 1, [Define for libnotify support])
+@@ -914,6 +914,21 @@ if test "x$have_libnotify" = "xyes"; the
fi

dnl
---------------------------------------------------------------------------
@@ -26,15 +24,11 @@
dnl Finish
dnl
---------------------------------------------------------------------------

- AC_SUBST(AUTH_LIBS)
- AC_SUBST(SAVER_LIBS)
Index: src/gnome-screensaver-dialog.c
===================================================================
--- src/gnome-screensaver-dialog.c.orig
+++ src/gnome-screensaver-dialog.c
-@@ -28,10 +28,15 @@
- #include <sys/time.h>
- #include <sys/types.h>
+@@ -30,6 +30,11 @@
#include <sys/wait.h>
#include <unistd.h>

@@ -46,11 +40,7 @@
#include <glib/gi18n.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
-
- #include "gs-lock-plug.h"
-@@ -64,10 +69,16 @@ static GOptionEntry entries [] = {
- { "away-message", 0, 0, G_OPTION_ARG_STRING, &away_message,
- N_("Message to show in the dialog"), N_("MESSAGE") },
+@@ -69,6 +74,12 @@ static GOptionEntry entries [] = {
{ NULL }
};

@@ -63,11 +53,7 @@
static char *
get_id_string (GtkWidget *widget)
{
- char *id = NULL;
-
-@@ -331,16 +342,122 @@ response_cb (GSLockPlug *plug,
- (response_id == GTK_RESPONSE_DELETE_EVENT)) {
- quit_response_cancel ();
+@@ -336,12 +347,118 @@ response_cb (GSLockPlug *plug,
}
}

@@ -186,11 +172,7 @@

again = TRUE;
res = do_auth_check (plug);
-
- if (res) {
-@@ -527,10 +644,26 @@ lock_initialization (int *argc,
- #endif /* NO_LOCKING */
-
+@@ -532,6 +649,22 @@ lock_initialization (int *argc,
return TRUE;
}

@@ -213,11 +195,7 @@
int
main (int argc,
char **argv)
- {
- GError *error = NULL;
-@@ -546,10 +679,38 @@ main (int argc,
-
- if (! g_thread_supported ()) {
+@@ -551,6 +684,34 @@ main (int argc,
g_thread_init (NULL);
}

@@ -252,11 +230,7 @@
g_type_init ();

gs_profile_start (NULL);
-
- if (! privileged_initialization (&argc, argv, verbose)) {
-@@ -558,11 +719,11 @@ main (int argc,
- }
-
+@@ -563,7 +724,7 @@ main (int argc,
error = NULL;
if (! gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error))
{
if (error != NULL) {
@@ -265,11 +239,7 @@
g_error_free (error);
}
exit (1);
- }
-
-@@ -601,10 +762,18 @@ main (int argc,
- gtk_main ();
-
+@@ -606,6 +767,14 @@ main (int argc,
if (xvkbd_running)
kill (xvkbd_pid, 9);

@@ -284,15 +254,11 @@
gs_profile_end (NULL);
gs_debug_shutdown ();

- return 0;
- }
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig
+++ src/Makefile.am
-@@ -29,10 +29,11 @@ INCLUDES =
\
- $(AUTH_CFLAGS) \
- $(DEBUG_CFLAGS) \
+@@ -31,6 +31,7 @@ INCLUDES =
\
$(DBUS_CFLAGS) \
$(LIBGNOMEKBDUI_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
@@ -300,11 +266,7 @@
$(NULL)

bin_PROGRAMS = \
- gnome-screensaver \
- gnome-screensaver-command \
-@@ -148,10 +149,11 @@ gnome_screensaver_dialog_LDADD = \
- $(GNOME_SCREENSAVER_DIALOG_LIBS)\
- $(SAVER_LIBS) \
+@@ -155,6 +156,7 @@ gnome_screensaver_dialog_LDADD = \
$(AUTH_LIBS) \
$(LIBGNOMEKBDUI_LIBS) \
$(LIBNOTIFY_LIBS) \
@@ -312,5 +274,3 @@
$(NULL)

BUILT_SOURCES = \
- gs-marshal.c \
- gs-marshal.h \


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages