tag 555781 + patch
severity 555781 important
user ubuntu-de...@lists.ubuntu.com
usertags 555781 + origin-ubuntu natty
thanks

still issues with the current version.
  * Fix FTBFS with ld --no-add-needed.
 
diff -u nvclock-0.8b4/debian/patches/00list nvclock-0.8b4/debian/patches/00list
--- nvclock-0.8b4/debian/patches/00list
+++ nvclock-0.8b4/debian/patches/00list
@@ -1,0 +2 @@
+02_ld_no_add_needed
--- nvclock-0.8b4.orig/debian/patches/02_ld_no_add_needed.dpatch
+++ nvclock-0.8b4/debian/patches/02_ld_no_add_needed.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+...@dpatch@
+--- ./src/qt/Makefile.in.~1.7.~        2008-05-11 12:25:46.000000000 +0200
++++ ./src/qt/Makefile.in       2011-01-10 22:44:43.408229422 +0100
+@@ -21,11 +21,11 @@
+ ifeq ($(HAVE_NVCONTROL), yes)
+     DEPS=$(libbackend) $(libnvcontrol)
+     includ...@x11_cflags@ -I./backend -I./nvcontrol -I.. -I../..
+-    li...@qt_libs@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
++    li...@qt_libs@ -L../backend -lbackend -L../nvcontrol -lnvcontrol 
@X11_LIBS@ -ldl
+ else
+     DEPS=$(libbackend)
+     includ...@x11_cflags@ -I./backend -I.. -I../..
+-    li...@qt_libs@ -L../backend -lbackend
++    li...@qt_libs@ -L../backend -lbackend @X11_LIBS@ -ldl
+ endif
+ 
+ .PHONY: clean distclean install
+--- nvclock-0.8b4.orig/src/gtk/Makefile.in
++++ nvclock-0.8b4/src/gtk/Makefile.in
+@@ -20,12 +20,12 @@
+ ifeq ($(HAVE_NVCONTROL), yes)
+     DEPS=$(libbackend) $(libnvcontrol)
+     includ...@x11_cflags@ -I./backend -I./nvcontrol -I.. -I../..
+-    li...@gtk_libs@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
++    li...@gtk_libs@ -L../backend -lbackend -L../nvcontrol -lnvcontrol 
@X11_LIBS@ -ldl
+     OBJECTS=banner.o gl.o hw.o main.o settings.o
+ else
+     DEPS=$(libbackend)
+     INCLUDES=-I./backend -I./nvcontrol -I.. -I../..
+-    li...@gtk_libs@ -L../backend -lbackend
++    li...@gtk_libs@ -L../backend -lbackend @X11_LIBS@ -ldl
+     OBJECTS=banner.o hw.o main.o settings.o
+ endif
+ 

Reply via email to