packages: nvidia-settings/nvidia-settings-xlibs.patch - X11_LIBS before LDF...

[glen]

Author: glen                         Date: Mon Jun 14 11:36:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- X11_LIBS before LDFLAGS or --as-needed kicks our ass

---- Files affected:
packages/nvidia-settings:
   nvidia-settings-xlibs.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/nvidia-settings/nvidia-settings-xlibs.patch
diff -u packages/nvidia-settings/nvidia-settings-xlibs.patch:1.2 packages/nvidia-settings/nvidia-settings-xlibs.patch:1.3
--- packages/nvidia-settings/nvidia-settings-xlibs.patch:1.2	Tue Dec 26 20:48:31 2006
+++ packages/nvidia-settings/nvidia-settings-xlibs.patch	Mon Jun 14 13:36:49 2010
@@ -1,5 +1,5 @@
---- nvidia-settings-1.0/Makefile~	2006-12-25 20:48:25.000000000 +0200
-+++ nvidia-settings-1.0/Makefile	2006-12-26 21:46:56.000000000 +0200
+--- nvidia-settings-1.0/Makefile	2006-12-26 21:46:56.000000000 +0200
++++ nvidia-settings-1.0/Makefile	2010-06-14 14:34:53.948906186 +0300
 @@ -118,7 +118,7 @@
  GTK_CFLAGS := $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
  GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
@@ -8,4 +8,13 @@
 +X11_LIBS := $(X11_LIB_DIRS) -lXxf86vm -lX11 -lXext
  
  XNVCTRL_LIB := src/libXNVCtrl/libXNVCtrl.a
+ 
+@@ -145,7 +145,7 @@
+ INC_FLAGS := $(addprefix -I , $(RELATIVE_SRCDIRS))
+ 
+ ALL_CFLAGS = $(CFLAGS) $(LOCAL_CFLAGS) $(X11_CFLAGS) $(GTK_CFLAGS) $(INC_FLAGS)
+-ALL_LDFLAGS = $(LD_RUN_FLAG) $(LDFLAGS) $(GTK_LDFLAGS) $(X11_LIBS)
++ALL_LDFLAGS = $(LD_RUN_FLAG) $(X11_LIBS) $(LDFLAGS) $(GTK_LDFLAGS)
+ 
+ CPPFLAGS = $(ALL_CFLAGS)
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nvidia-settings/nvidia-settings-xlibs.patch?r1=1.2&r2=1.3&f=u