diff options
author | M.Dinslage <daedra@charter.net> | 2010-05-13 00:59:28 +0200 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-13 00:59:28 +0200 |
commit | fd43ae99e22a223602e5fa8e9932f005900fe965 (patch) | |
tree | ee8cbfe38660726da7afb239e8eaf9fa7b787c02 /misc/nvclock/patches | |
parent | 771aacb37dc03e2ea87f64c157e179934b0c595a (diff) | |
download | slackbuilds-fd43ae99e22a223602e5fa8e9932f005900fe965.tar.gz |
misc/nvclock: Added to 13.0 repository
Diffstat (limited to 'misc/nvclock/patches')
-rw-r--r-- | misc/nvclock/patches/nvclock-fix_DESTDIR.patch | 145 | ||||
-rw-r--r-- | misc/nvclock/patches/nvclock-use_ALL_CFLAGS.patch | 118 | ||||
-rw-r--r-- | misc/nvclock/patches/nvclock-use_most_CFLAGS.patch | 93 |
3 files changed, 356 insertions, 0 deletions
diff --git a/misc/nvclock/patches/nvclock-fix_DESTDIR.patch b/misc/nvclock/patches/nvclock-fix_DESTDIR.patch new file mode 100644 index 0000000000..0596cfa784 --- /dev/null +++ b/misc/nvclock/patches/nvclock-fix_DESTDIR.patch @@ -0,0 +1,145 @@ +diff -Nur nvclock0.8b4.orig/Makefile.in nvclock0.8b4/Makefile.in +--- nvclock0.8b4.orig/Makefile.in 2008-05-11 05:25:44.000000000 -0500 ++++ nvclock0.8b4/Makefile.in 2009-01-07 16:15:50.088688188 -0600 +@@ -1,8 +1,9 @@ + INSTALL=@INSTALL@ ++DESTDIR = ++prefix=@prefix@ ++docdir=@docdir@ ++mandir=@mandir@ + +-prefix=$(DESTDIR)@prefix@ +-docdir=${prefix}/share/doc/nvclock +-mandir=${prefix}/man + DOCS= ABOUT AUTHORS ChangeLog FAQ README + + all: +@@ -21,7 +22,7 @@ + install-docs: + @documentations='$(DOCS)'; \ + for doc in $$documentations; do \ +- destdir=$(docdir); \ ++ destdir=$(DESTDIR)$(docdir); \ + name=`echo $$doc` \ + dir=$$destdir; \ + mkdir -p $$dir; \ +@@ -30,14 +31,14 @@ + done + + install-desktop-shortcut: +- mkdir -p $(prefix)/share/applications +- mkdir -p $(prefix)/share/icons/hicolor/48x48/apps +- cp nvclock.desktop $(prefix)/share/applications +- cp nvclock.png $(prefix)/share/icons/hicolor/48x48/apps ++ mkdir -p $(DESTDIR)$(prefix)/share/applications ++ mkdir -p $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps ++ cp nvclock.desktop $(DESTDIR)$(prefix)/share/applications ++ cp nvclock.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps + + install-man: +- mkdir -p $(mandir)/man1 +- cp nvclock.1 $(mandir)/man1 ++ mkdir -p $(DESTDIR)$(mandir)/man1 ++ cp nvclock.1 $(DESTDIR)$(mandir)/man1 + + uninstall: uninstall-docs uninstall-man uninstall-desktop-shortcut + $(MAKE) -C src uninstall +@@ -45,7 +46,7 @@ + uninstall-docs: + @documentations='$(DOCS)'; \ + for doc in $$documentations; do \ +- destdir=$(docdir); \ ++ destdir=$(DESTDIR)$(docdir); \ + name=`echo $$doc` \ + dir=$$destdir; \ + rm -f $$dir/$$name; \ +@@ -53,11 +54,12 @@ + done + + uninstall-desktop-shortcut: +- rm -f $(prefix)/share/applications/nvclock.desktop +- echo "removing $$prefix/share/applications/nvclock.desktop" ; \ +- rm -f $(prefix)/share/icons/hicolor/48x48/apps/nvclock.png +- echo "removing $$prefix/share/icons/hicolor/48x48/apps/nvclock.png" ; \ ++ rm -f $(DESTDIR)$(prefix)/share/applications/nvclock.desktop ++ echo "removing $$(DESTDIR)$$prefix/share/applications/nvclock.desktop" ; \ ++ rm -f $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/nvclock.png ++ echo "removing $$(DESTDIR)$$prefix/share/icons/hicolor/48x48/apps/nvclock.png" ; \ + + uninstall-man: +- rm -f $(mandir)/man1/nvclock.1 +- echo "removing $$mandir/man1/nvclock.1" ; \ ++ rm -f $$(DESTDIR)$(mandir)/man1/nvclock.1 ++ echo "removing $$(DESTDIR)$$mandir/man1/nvclock.1" ; \ ++ +diff -Nur nvclock0.8b4.orig/src/Makefile.in nvclock0.8b4/src/Makefile.in +--- nvclock0.8b4.orig/src/Makefile.in 2009-01-03 11:02:54.000000000 -0600 ++++ nvclock0.8b4/src/Makefile.in 2009-01-07 16:13:06.839689315 -0600 +@@ -8,9 +8,9 @@ + libbackend=./backend/libbackend.a + libnvcontrol=./nvcontrol/libnvcontrol.a + +-prefix=$(DESTDIR)@prefix@ +-exec_prefix=$(DESTDIR)@exec_prefix@ +-bindir=$(DESTDIR)@bindir@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++bindir=@bindir@ + + ifeq ($(HAVE_NVCONTROL), yes) + DEPS=$(libbackend) $(libnvcontrol) +@@ -56,7 +56,7 @@ + + uninstall: uninstall-recursive uninstall-app + uninstall-app: +- rm -f $(bindir)/smartdimmer ++ rm -f $(DESTDIR)$(bindir)/smartdimmer + + + # Walk through the sub directories and do what is requested +diff -Nur nvclock0.8b4.orig/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in +--- nvclock0.8b4.orig/src/gtk/Makefile.in 2008-05-11 05:25:46.000000000 -0500 ++++ nvclock0.8b4/src/gtk/Makefile.in 2009-01-07 16:13:54.808688249 -0600 +@@ -7,14 +7,14 @@ + libbackend=../backend/libbackend.a + libnvcontrol=../nvcontrol/libnvcontrol.a + +-prefix=$(DESTDIR)@prefix@ +-exec_prefix=$(DESTDIR)@exec_prefix@ +-bindir=$(DESTDIR)@bindir@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++bindir=@bindir@ + + ifeq ($(HAVE_GTK2), yes) + PROGRAM=nvclock_gtk +- INSTALL_APP=mkdir -p $(bindir); $(INSTALL) -c $(PROGRAM) $(bindir)/$(PROGRAM) +- UNINSTALL_APP=rm -f $(bindir)/$(PROGRAM) ++ INSTALL_APP=mkdir -p $(DESTDIR)$(bindir); $(INSTALL) -c $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) ++ UNINSTALL_APP=rm -f $(DESTDIR)$(bindir)/$(PROGRAM) + endif + + ifeq ($(HAVE_NVCONTROL), yes) +diff -Nur nvclock0.8b4.orig/src/qt/Makefile.in nvclock0.8b4/src/qt/Makefile.in +--- nvclock0.8b4.orig/src/qt/Makefile.in 2008-05-11 05:25:46.000000000 -0500 ++++ nvclock0.8b4/src/qt/Makefile.in 2009-01-07 16:15:03.885688805 -0600 +@@ -8,14 +8,14 @@ + HAVE_QT=@HAVE_QT@ + libbackend=../backend/libbackend.a + +-prefix=$(DESTDIR)@prefix@ +-exec_prefix=$(DESTDIR)@exec_prefix@ +-bindir=$(DESTDIR)@bindir@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++bindir=@bindir@ + + ifeq ($(HAVE_QT), yes) + PROGRAM=nvclock_qt +- INSTALL_APP=mkdir -p $(bindir); $(INSTALL) -c $(PROGRAM) $(bindir)/$(PROGRAM) +- UNINSTALL_APP=rm -f $(bindir)/$(PROGRAM) ++ INSTALL_APP=mkdir -p $(DESTDIR)$(bindir); $(INSTALL) -c $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) ++ UNINSTALL_APP=rm -f $(DESTDIR)$(bindir)/$(PROGRAM) + endif + + ifeq ($(HAVE_NVCONTROL), yes) diff --git a/misc/nvclock/patches/nvclock-use_ALL_CFLAGS.patch b/misc/nvclock/patches/nvclock-use_ALL_CFLAGS.patch new file mode 100644 index 0000000000..ebdb7d562c --- /dev/null +++ b/misc/nvclock/patches/nvclock-use_ALL_CFLAGS.patch @@ -0,0 +1,118 @@ +diff -Nur nvclock0.8b4.orig/Makefile.in nvclock0.8b4/Makefile.in +--- nvclock0.8b4.orig/Makefile.in 2008-05-11 05:25:44.000000000 -0500 ++++ nvclock0.8b4/Makefile.in 2009-01-07 16:19:12.437689102 -0600 +@@ -5,6 +5,9 @@ + mandir=${prefix}/man + DOCS= ABOUT AUTHORS ChangeLog FAQ README + ++CFLAGS=@CFLAGS@ ++CXXFLAGS=@CXXFLAGS@ ++ + all: + $(MAKE) -C src all + +diff -Nur nvclock0.8b4.orig/configure nvclock0.8b4/configure +--- nvclock0.8b4.orig/configure 2008-08-16 11:53:59.000000000 -0500 ++++ nvclock0.8b4/configure 2009-01-07 16:24:27.896687454 -0600 +@@ -3726,7 +3726,6 @@ + + + +-CFLAGS= + HAVE_GTK2=no + HAVE_QT=no + HAVE_NVCONTROL=no +diff -Nur nvclock0.8b4.orig/src/Makefile.in nvclock0.8b4/src/Makefile.in +--- nvclock0.8b4.orig/src/Makefile.in 2009-01-03 11:02:54.000000000 -0600 ++++ nvclock0.8b4/src/Makefile.in 2009-01-07 16:26:38.506689444 -0600 +@@ -1,5 +1,6 @@ + CC=@CC@ + INSTALL=@INSTALL@ ++CFLAGS=@CFLAGS@ + + nvclock_SOURCES=nvclock.c + smartdimmer_SOURCES=smartdimmer.c +@@ -31,10 +32,10 @@ + + + nvclock: $(DEPS) $(LIB) nvclock.c +- $(CC) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS) ++ $(CC) $(CFLAGS) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS) + + smartdimmer: $(DEPS) $(LIB) smartdimmer.c +- $(CC) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS) ++ $(CC) $(CFLAGS) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS) + + + clean: clean-recursive clean-app +diff -Nur nvclock0.8b4.orig/src/backend/Makefile.in nvclock0.8b4/src/backend/Makefile.in +--- nvclock0.8b4.orig/src/backend/Makefile.in 2007-12-27 10:05:38.000000000 -0600 ++++ nvclock0.8b4/src/backend/Makefile.in 2009-01-07 16:32:28.089689122 -0600 +@@ -1,11 +1,12 @@ +-CC=@CC@ -O0 ++CC=@CC@ + AR=ar + RANLIB=@RANLIB@ + + system=@system@ + HAVE_NVCONTROL=@HAVE_NVCONTROL@ + OBJECTS=backend.o bios.o config.o error.o nv30.o nv40.o nv50.o info.o overclock.o utils.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o +-CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol ++CFLAGS=@CFLAGS@ ++CFLAGS+=@X11_CFLAGS@ -I../.. -I../nvcontrol + + ifeq ($(system), FreeBSD) + OBJECTS+=back_bsd.o +@@ -36,4 +37,4 @@ + rm -f Makefile + + install: +-uninstall: +\ No newline at end of file ++uninstall: +diff -Nur nvclock0.8b4.orig/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in +--- nvclock0.8b4.orig/src/gtk/Makefile.in 2008-05-11 05:25:46.000000000 -0500 ++++ nvclock0.8b4/src/gtk/Makefile.in 2009-01-07 16:28:51.865688400 -0600 +@@ -1,7 +1,8 @@ + CC=@CC@ + INSTALL=@INSTALL@ + +-CFLAGS=@GTK_CFLAGS@ -I../backend -I../nvcontrol -I../.. ++CFLAGS=@CFLAGS@ ++CFLAGS+=@GTK_CFLAGS@ -I../backend -I../nvcontrol -I../.. + HAVE_GTK2=@HAVE_GTK2@ + HAVE_NVCONTROL=@HAVE_NVCONTROL@ + libbackend=../backend/libbackend.a +diff -Nur nvclock0.8b4.orig/src/nvcontrol/Makefile.in nvclock0.8b4/src/nvcontrol/Makefile.in +--- nvclock0.8b4.orig/src/nvcontrol/Makefile.in 2005-12-09 13:46:05.000000000 -0600 ++++ nvclock0.8b4/src/nvcontrol/Makefile.in 2009-01-07 16:29:09.340689195 -0600 +@@ -2,7 +2,8 @@ + AR=ar + RANLIB=@RANLIB@ + system=@system@ +-CFLAGS=@X11_CFLAGS@ -I../backend ++CFLAGS=@CFLAGS@ ++CFLAGS+=@X11_CFLAGS@ -I../backend + HAVE_X11=@HAVE_NVCONTROL@ + OBJECTS=libnvcontrol.o nvcontrol.o + +@@ -26,4 +27,4 @@ + rm -f Makefile + + install: +-uninstall: +\ No newline at end of file ++uninstall: +diff -Nur nvclock0.8b4.orig/src/qt/Makefile.in nvclock0.8b4/src/qt/Makefile.in +--- nvclock0.8b4.orig/src/qt/Makefile.in 2008-05-11 05:25:46.000000000 -0500 ++++ nvclock0.8b4/src/qt/Makefile.in 2009-01-07 16:29:42.410690235 -0600 +@@ -3,7 +3,8 @@ + MOC=@MOC@ + + OBJECTS=main.o qt_nvclock.o qt_nvclock.moc.o qt_xfree.o qt_xfree.moc.o +-CXXFLAGS=@QT_CFLAGS@ -I../backend ++CXXFLAGS=@CXXFLAGS@ ++CXXFLAGS+=@QT_CFLAGS@ -I../backend + HAVE_NVCONTROL=@HAVE_NVCONTROL@ + HAVE_QT=@HAVE_QT@ + libbackend=../backend/libbackend.a diff --git a/misc/nvclock/patches/nvclock-use_most_CFLAGS.patch b/misc/nvclock/patches/nvclock-use_most_CFLAGS.patch new file mode 100644 index 0000000000..ffab3c83e2 --- /dev/null +++ b/misc/nvclock/patches/nvclock-use_most_CFLAGS.patch @@ -0,0 +1,93 @@ +diff -Nur nvclock0.8b4.orig/Makefile.in nvclock0.8b4/Makefile.in +--- nvclock0.8b4.orig/Makefile.in 2008-05-11 05:25:44.000000000 -0500 ++++ nvclock0.8b4/Makefile.in 2009-01-07 16:19:12.437689102 -0600 +@@ -5,6 +5,9 @@ + mandir=${prefix}/man + DOCS= ABOUT AUTHORS ChangeLog FAQ README + ++CFLAGS=@CFLAGS@ ++CXXFLAGS=@CXXFLAGS@ ++ + all: + $(MAKE) -C src all + +diff -Nur nvclock0.8b4.orig/configure nvclock0.8b4/configure +--- nvclock0.8b4.orig/configure 2008-08-16 11:53:59.000000000 -0500 ++++ nvclock0.8b4/configure 2009-01-07 16:24:27.896687454 -0600 +@@ -3726,7 +3726,6 @@ + + + +-CFLAGS= + HAVE_GTK2=no + HAVE_QT=no + HAVE_NVCONTROL=no +diff -Nur nvclock0.8b4.orig/src/Makefile.in nvclock0.8b4/src/Makefile.in +--- nvclock0.8b4.orig/src/Makefile.in 2009-01-03 11:02:54.000000000 -0600 ++++ nvclock0.8b4/src/Makefile.in 2009-01-07 16:26:38.506689444 -0600 +@@ -1,5 +1,6 @@ + CC=@CC@ + INSTALL=@INSTALL@ ++CFLAGS=@CFLAGS@ + + nvclock_SOURCES=nvclock.c + smartdimmer_SOURCES=smartdimmer.c +@@ -31,10 +32,10 @@ + + + nvclock: $(DEPS) $(LIB) nvclock.c +- $(CC) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS) ++ $(CC) $(CFLAGS) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS) + + smartdimmer: $(DEPS) $(LIB) smartdimmer.c +- $(CC) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS) ++ $(CC) $(CFLAGS) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS) + + + clean: clean-recursive clean-app +diff -Nur nvclock0.8b4.orig/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in +--- nvclock0.8b4.orig/src/gtk/Makefile.in 2008-05-11 05:25:46.000000000 -0500 ++++ nvclock0.8b4/src/gtk/Makefile.in 2009-01-07 16:28:51.865688400 -0600 +@@ -1,7 +1,8 @@ + CC=@CC@ + INSTALL=@INSTALL@ + +-CFLAGS=@GTK_CFLAGS@ -I../backend -I../nvcontrol -I../.. ++CFLAGS=@CFLAGS@ ++CFLAGS+=@GTK_CFLAGS@ -I../backend -I../nvcontrol -I../.. + HAVE_GTK2=@HAVE_GTK2@ + HAVE_NVCONTROL=@HAVE_NVCONTROL@ + libbackend=../backend/libbackend.a +diff -Nur nvclock0.8b4.orig/src/nvcontrol/Makefile.in nvclock0.8b4/src/nvcontrol/Makefile.in +--- nvclock0.8b4.orig/src/nvcontrol/Makefile.in 2005-12-09 13:46:05.000000000 -0600 ++++ nvclock0.8b4/src/nvcontrol/Makefile.in 2009-01-07 16:29:09.340689195 -0600 +@@ -2,7 +2,8 @@ + AR=ar + RANLIB=@RANLIB@ + system=@system@ +-CFLAGS=@X11_CFLAGS@ -I../backend ++CFLAGS=@CFLAGS@ ++CFLAGS+=@X11_CFLAGS@ -I../backend + HAVE_X11=@HAVE_NVCONTROL@ + OBJECTS=libnvcontrol.o nvcontrol.o + +@@ -26,4 +27,4 @@ + rm -f Makefile + + install: +-uninstall: +\ No newline at end of file ++uninstall: +diff -Nur nvclock0.8b4.orig/src/qt/Makefile.in nvclock0.8b4/src/qt/Makefile.in +--- nvclock0.8b4.orig/src/qt/Makefile.in 2008-05-11 05:25:46.000000000 -0500 ++++ nvclock0.8b4/src/qt/Makefile.in 2009-01-07 16:29:42.410690235 -0600 +@@ -3,7 +3,8 @@ + MOC=@MOC@ + + OBJECTS=main.o qt_nvclock.o qt_nvclock.moc.o qt_xfree.o qt_xfree.moc.o +-CXXFLAGS=@QT_CFLAGS@ -I../backend ++CXXFLAGS=@CXXFLAGS@ ++CXXFLAGS+=@QT_CFLAGS@ -I../backend + HAVE_NVCONTROL=@HAVE_NVCONTROL@ + HAVE_QT=@HAVE_QT@ + libbackend=../backend/libbackend.a |