r38376 - in /desktop/unstable/libwnck3/debian: changelog patches/01_tasklist_orientation.patch patches/99_ltmain_as-needed.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jun  5 08:21:05 2013
New Revision: 38376

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38376
Log:
Refresh patches.

Modified:
    desktop/unstable/libwnck3/debian/changelog
    desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch
    desktop/unstable/libwnck3/debian/patches/99_ltmain_as-needed.patch

Modified: desktop/unstable/libwnck3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/changelog?rev=38376&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/changelog [utf-8] (original)
+++ desktop/unstable/libwnck3/debian/changelog [utf-8] Wed Jun  5 08:21:05 2013
@@ -1,6 +1,7 @@
 libwnck3 (3.4.5-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh patches.
 
  -- Michael Biebl <biebl at debian.org>  Mon, 14 May 2012 19:54:32 +0200
 

Modified: desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch?rev=38376&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch [utf-8] (original)
+++ desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch [utf-8] Wed Jun  5 08:21:05 2013
@@ -1,10 +1,10 @@
 Debian #524117
 GNOME #513347 and #86382
 
-Index: libwnck-3.4.2/libwnck/tasklist.c
+Index: libwnck-3.4.5/libwnck/tasklist.c
 ===================================================================
---- libwnck-3.4.2.orig/libwnck/tasklist.c	2012-05-14 19:29:15.105044384 +0200
-+++ libwnck-3.4.2/libwnck/tasklist.c	2012-05-14 19:29:17.501044299 +0200
+--- libwnck-3.4.5.orig/libwnck/tasklist.c	2013-06-05 10:08:37.198079933 +0200
++++ libwnck-3.4.5/libwnck/tasklist.c	2013-06-05 10:08:37.190079840 +0200
 @@ -228,6 +228,8 @@
    GtkReliefStyle relief;
  
@@ -233,7 +233,7 @@
  
    return GTK_WIDGET (tasklist);
  }
-@@ -4062,7 +4135,6 @@
+@@ -4069,7 +4142,6 @@
    WnckTask *task;
  
    task = g_object_new (WNCK_TYPE_TASK, NULL);
@@ -241,10 +241,10 @@
    task->type = WNCK_TASK_WINDOW;
    task->window = g_object_ref (window);
    task->class_group = g_object_ref (wnck_window_get_class_group (window));
-Index: libwnck-3.4.2/libwnck/tasklist.h
+Index: libwnck-3.4.5/libwnck/tasklist.h
 ===================================================================
---- libwnck-3.4.2.orig/libwnck/tasklist.h	2012-05-14 19:29:15.105044384 +0200
-+++ libwnck-3.4.2/libwnck/tasklist.h	2012-05-14 19:29:17.501044299 +0200
+--- libwnck-3.4.5.orig/libwnck/tasklist.h	2013-06-05 10:08:37.198079933 +0200
++++ libwnck-3.4.5/libwnck/tasklist.h	2013-06-05 10:08:37.194079886 +0200
 @@ -103,6 +103,10 @@
  					       gboolean      include_all_workspaces);
  void wnck_tasklist_set_button_relief (WnckTasklist *tasklist,

Modified: desktop/unstable/libwnck3/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/patches/99_ltmain_as-needed.patch?rev=38376&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/libwnck3/debian/patches/99_ltmain_as-needed.patch [utf-8] Wed Jun  5 08:21:05 2013
@@ -1,24 +1,25 @@
-Index: libwnck-2.30.0/ltmain.sh
-===================================================================
---- libwnck-2.30.0.orig/ltmain.sh	2010-04-23 19:41:31.894859918 +0200
-+++ libwnck-2.30.0/ltmain.sh	2010-04-23 19:41:34.679353830 +0200
-@@ -4716,6 +4716,11 @@ func_mode_link ()
+Bug-Debian: http://bugs.debian.org/347650
+Last-Update: 2011-06-14
+
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5800,6 +5800,11 @@ func_mode_link ()
  	arg=$func_stripname_result
  	;;
  
-+      -Wl,--as-needed)
++      -Wl,--as-needed|-Wl,--no-as-needed)
 +	deplibs="$deplibs $arg"
 +	continue
 +	;;
-+      
++
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -5067,6 +5072,15 @@ func_mode_link ()
+@@ -6163,6 +6168,15 @@ func_mode_link ()
  	lib=
  	found=no
  	case $deplib in
-+	-Wl,--as-needed)
++	-Wl,--as-needed|-Wl,--no-as-needed)
 +	  if test "$linkmode,$pass" = "prog,link"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -27,6 +28,6 @@
 +	  fi
 +	  continue
 +	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
  	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"