[Pkg-wmaker-commits] [wmhdplop] 14/26: debian/patches: Remove directory; patches applied upstream.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Fri Nov 25 01:49:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmhdplop.
commit c76bd01039118438237c860f855ba8d4ccb82e6f
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Thu Nov 24 19:57:20 2016 -0500
debian/patches: Remove directory; patches applied upstream.
---
debian/patches/find-disk-device.patch | 60 -----------------
debian/patches/fix-ftbfs-gcc-4.7-667415.patch | 28 --------
debian/patches/fix_compiler_warnings.patch | 93 ---------------------------
debian/patches/ldflags-to-ldadd.patch | 27 --------
debian/patches/modernize_autotools.patch | 52 ---------------
debian/patches/series | 5 --
6 files changed, 265 deletions(-)
diff --git a/debian/patches/find-disk-device.patch b/debian/patches/find-disk-device.patch
deleted file mode 100644
index 2559b02..0000000
--- a/debian/patches/find-disk-device.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Fails to find any disk device after /run transition
- Dear Maintainer,
- .
- after the recent /run transition, which also finally turned /etc/mtab into
- a symlink to /proc/mounts, *hdplop (both incarnations) may fail to find a
- single disk device automatically. This is likely due to the root device
- now being exposed as mounted on /dev/disk/by-uuid/$UUID whereas the
- former /etc/mtab as written by mount still contained a device name as
- taken from /etc/fstab, which in my case could be parsed by *hdplop. It's
- unclear if this wouldn't have hit other environments earlier depending
- on their fstab contents, I just assume for now that I'm one of the
- remaining handful of users of this tool ;)
- .
- The fundamental issue is of course the rather crude code in devnames.c's
- device_id_from_name() which tries to manually resolve device symlinks,
- but cannot possibly work with any symlink except those located directly
- in /dev - symlinks in subdirectories of /dev will fail.
- .
- Impact on wmhdplop: Doesn't start except when called explicitely with
- some "-d /dev/sda" or such option.
- .
- Impact on gkrellm-hdplop: Starts but is dazed and confused, leaving a
- black window in gkrellm. Clicking on the black window will then crash
- gkrellm, as it hits an assertion that the device list cannot be empty.
- .
- I've prepared a small patch that makes *hdplop work again for me, the
- patch replaces the broken manual symlink resolving by a simple call
- to realpath(3), hopefully not breaking other stuff. I refrained from
- doing any more changes to the code, even though it looks like it needs
- some love. Upstream seems to have lost interest five years ago, though...
- .
- So, without much further ado, here's my crude fix:
- .
- Don't look too closely, specifically on the strncpy(3) stuff, but I felt
- this is still better than abusing snprintf(3) like the original code does
- some lines above, and as I said, starting to really fix things here looks
- like a bottomless pit...
- .
- Thanks,
- Andre.
-Author: Andre Beck <beck at ibh.de>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657882
-Last-Update: 2014-08-11
-
---- a/devnames.c
-+++ b/devnames.c
-@@ -186,9 +186,10 @@
-
- if (lstat(devname,&stat_buf)) { BLAHBLAH(1,perror(devname)); return -1; }
- if (S_ISLNK(stat_buf.st_mode)) {
-- char lname[512];
-- int n = readlink(devname, lname, 511); lname[n] = 0;
-- snprintf(devname,512,"/dev/%s",stripdev(lname));
-+ devname_ = realpath(devname, NULL);
-+ if(!devname_) { BLAHBLAH(1,perror(devname)); return -1; }
-+ strncpy(devname, devname_, 512); devname[511] = 0;
-+ free(devname_);
- if (stat(devname,&stat_buf)) { BLAHBLAH(1,perror(devname)); return -1; }
- }
- if (!S_ISBLK(stat_buf.st_mode)) {
diff --git a/debian/patches/fix-ftbfs-gcc-4.7-667415.patch b/debian/patches/fix-ftbfs-gcc-4.7-667415.patch
deleted file mode 100644
index e8061a0..0000000
--- a/debian/patches/fix-ftbfs-gcc-4.7-667415.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix GCC 4.7 FTBFS
- -Wl needs to have values passed to it so that it can pass those on to the
- linker.
-Author: Paul Tagliamonte <paultag at ubuntu.com>
-Bug-Debian: http://bugs.debian.org/667415
-Origin: vendor
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,6 +18,6 @@
-
- gkhdplop_so_SOURCES=$(LIBTOOLSUX_GKHDPLOP_SRC)
- gkhdplop_so_CFLAGS=-DGKRELLM -fPIC $(GTK2_CFLAGS) $(IMLIB2_CFLAGS)
--gkhdplop_so_LDFLAGS=-shared -Wl $(IMLIB2_LIBS) -lm
-+gkhdplop_so_LDFLAGS=-shared $(IMLIB2_LIBS) -lm
-
- all: @GKHDPLOP@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -202,7 +202,7 @@
- LIBTOOLSUX_GKHDPLOP_SRC = wmhdplop.c util.c util.h procstat.c procstat.h devnames.c devnames.h global.h dockapp_imlib2.c dockapp_imlib2.h gkrellm_hdplop.c
- gkhdplop_so_SOURCES = $(LIBTOOLSUX_GKHDPLOP_SRC)
- gkhdplop_so_CFLAGS = -DGKRELLM -fPIC $(GTK2_CFLAGS) $(IMLIB2_CFLAGS)
--gkhdplop_so_LDFLAGS = -shared -Wl $(IMLIB2_LIBS) -lm
-+gkhdplop_so_LDFLAGS = -shared $(IMLIB2_LIBS) -lm
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
-
diff --git a/debian/patches/fix_compiler_warnings.patch b/debian/patches/fix_compiler_warnings.patch
deleted file mode 100644
index 6ce3505..0000000
--- a/debian/patches/fix_compiler_warnings.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Description: Fix compiler warnings.
- In particular, the following:
- .
- wmhdplop.c:451:96: warning: operation on ‘dl->touched_w’ may be undefined
- [-Wsequence-point]
- .
- wmhdplop.c:980:44: warning: ignoring return value of ‘seteuid’, declared with
- attribute warn_unused_result [-Wunused-result]
- .
- procstat.c:73:19: warning: variable ‘in_our_disk’ set but not used
- [-Wunused-but-set-variable]
- .
- dockapp_imlib2.c:311:85: warning: unused parameter ‘prefs’ [-Wunused-parameter]
- .
- gkrellm_hdplop.c:187:40: warning: unused parameter ‘widget’
- [-Wunused-parameter]
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2014-10-14
-
---- a/wmhdplop.c
-+++ b/wmhdplop.c
-@@ -448,7 +448,8 @@
- imlib_image_fill_rectangle(lx+1,y-5,3,3);
- }
- if (dl->touched_w) {
-- imlib_context_set_color(255,100-10*dl->touched_w,100-10*dl->touched_w, 25*dl->touched_w--);
-+ imlib_context_set_color(255,100-10*dl->touched_w,100-10*dl->touched_w, 25*dl->touched_w - 1);
-+ dl->touched_w--;
- imlib_image_fill_rectangle(lx+1,y-9,3,3);
- }
- x += 5;
-@@ -977,7 +978,12 @@
- int hdplop_main(int width, int height, GdkDrawable *gkdrawable)
- #endif
- {
-- euid = geteuid(); uid = getuid(); seteuid(uid);
-+ int s;
-+
-+ euid = geteuid(); uid = getuid();
-+ s = seteuid(uid);
-+ if (s == -1)
-+ fprintf(stderr, "seteuid(uid) failed : %s\n", strerror(errno));
- ALLOC_OBJ(app);
- srand(time(NULL));
- /* Initialize options */
---- a/procstat.c
-+++ b/procstat.c
-@@ -70,7 +70,7 @@
- FILE *f;
- char line[1024];
- char hdname[200];
-- int readok = 0, in_our_disk = 0;
-+ int readok = 0;
- const char *proc_fname;
- if (!use_proc_diskstats) proc_fname = "/proc/partitions";
- else proc_fname = "/proc/diskstats";
-@@ -93,7 +93,6 @@
- dl->touched_r = (dl->nr - nr) ? 10 : dl->touched_r;
- dl->touched_w = (dl->nw - nw) ? 10 : dl->touched_w;
- dl->nr = nr; dl->nw = nw;
-- if (!is_partition(major,minor)) in_our_disk = 1;
- if (is_displayed(dl->hd_id,dl->part_id) &&
- ((dl->part_id && (!find_id(dl->hd_id, 0) || !is_displayed(dl->hd_id, 0))) || /* partition without host disk */
- (dl->part_id == 0))) /* disk */
-@@ -112,7 +111,7 @@
- }
- readok = 2;
- }
-- } else if (!is_partition(major,minor)) in_our_disk = 0;
-+ }
- /* if (in_our_disk || find_dev(major,minor))*/ {
- strlist *sl;
- for (sl = swap_list(); sl; sl=sl->next) {
---- a/dockapp_imlib2.c
-+++ b/dockapp_imlib2.c
-@@ -319,6 +319,7 @@
- #ifndef GKRELLM
- dockimlib2_xinit(dock, prefs);
- #else
-+ (void) prefs;
- dockimlib2_gkrellm_xinit(dock, gkdrawable);
- #endif
- dockimlib2_setup_imlib(dock);
---- a/gkrellm_hdplop.c
-+++ b/gkrellm_hdplop.c
-@@ -185,6 +185,7 @@
- }
-
- static void cb_reload_fonts(GtkWidget *widget) {
-+ (void) widget;
- if (strcmp(gtk_entry_get_text(GTK_ENTRY(entry_smallfont)), app->current_smallfont_name) ||
- strcmp(gtk_entry_get_text(GTK_ENTRY(entry_bigfont)), app->current_bigfont_name)) {
- ASSIGN_STRING(Prefs.smallfontname, gtk_entry_get_text(GTK_ENTRY(entry_smallfont)));
diff --git a/debian/patches/ldflags-to-ldadd.patch b/debian/patches/ldflags-to-ldadd.patch
deleted file mode 100644
index 6c4ff8a..0000000
--- a/debian/patches/ldflags-to-ldadd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Change gkhdplop_so_LDFLAGS to gkhdplop_so_LDADD in Makefile
- This patch prevents a "undefined symbol: imlib_image_draw_pixel" error by
- placing -lImlib2 after the *.o files during make.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/wmhdplop/+bug/995272
-Last-Update: 2014-08-11
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,6 +18,6 @@
-
- gkhdplop_so_SOURCES=$(LIBTOOLSUX_GKHDPLOP_SRC)
- gkhdplop_so_CFLAGS=-DGKRELLM -fPIC $(GTK2_CFLAGS) $(IMLIB2_CFLAGS)
--gkhdplop_so_LDFLAGS=-shared $(IMLIB2_LIBS) -lm
-+gkhdplop_so_LDADD=-shared $(IMLIB2_LIBS) -lm
-
- all: @GKHDPLOP@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -202,7 +202,7 @@
- LIBTOOLSUX_GKHDPLOP_SRC = wmhdplop.c util.c util.h procstat.c procstat.h devnames.c devnames.h global.h dockapp_imlib2.c dockapp_imlib2.h gkrellm_hdplop.c
- gkhdplop_so_SOURCES = $(LIBTOOLSUX_GKHDPLOP_SRC)
- gkhdplop_so_CFLAGS = -DGKRELLM -fPIC $(GTK2_CFLAGS) $(IMLIB2_CFLAGS)
--gkhdplop_so_LDFLAGS = -shared $(IMLIB2_LIBS) -lm
-+gkhdplop_so_LDADD = -shared $(IMLIB2_LIBS) -lm
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
-
diff --git a/debian/patches/modernize_autotools.patch b/debian/patches/modernize_autotools.patch
deleted file mode 100644
index 9327c70..0000000
--- a/debian/patches/modernize_autotools.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Modernize autotools.
- In particular, fix the following errors and warnings:
- .
- configure.ac:2: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are
- deprecated. For more info, see:
- configure.ac:2: http://www.gnu.org/software/automake/manual/automake.html
- #Modernize-AM_005fINIT_005fAUTOMAKE-invocation
- .
- Makefile.am:21: error: linker flags such as '-shared' belong in
- 'gkhdplop_so_LDFLAGS'
- .
- ./configure: line 2910: syntax error near unexpected token `build_old_libs,'
- ./configure: line 2910: ` _LT_DECL(build_old_libs, enable_static, 0,'
- .
- ./configure: line 2908: syntax error near unexpected token
- `build_libtool_libs,'
- ./configure: line 2908: ` _LT_DECL(build_libtool_libs, enable_shared, 0,'
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2014-10-11
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,6 @@
--AC_INIT(wmhdplop.c)
--AM_INIT_AUTOMAKE(wmhdplop, 0.9.9)
-+AC_INIT(wmhdplop, 0.9.9)
-+AC_CONFIG_SRCDIR(wmhdplop.c)
-+AM_INIT_AUTOMAKE
- AM_CONFIG_HEADER(config.h)
-
- AC_SUBST(VERSION)
-@@ -9,9 +10,6 @@
-
- AC_CANONICAL_HOST
-
--AM_DISABLE_STATIC
--AM_ENABLE_SHARED
--
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_HEADER_STDC
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,6 +18,7 @@
-
- gkhdplop_so_SOURCES=$(LIBTOOLSUX_GKHDPLOP_SRC)
- gkhdplop_so_CFLAGS=-DGKRELLM -fPIC $(GTK2_CFLAGS) $(IMLIB2_CFLAGS)
--gkhdplop_so_LDADD=-shared $(IMLIB2_LIBS) -lm
-+gkhdplop_so_LDADD=$(IMLIB2_LIBS) -lm
-+gkhdplop_so_LDFLAGS=-shared
-
- all: @GKHDPLOP@
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2654569..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-fix-ftbfs-gcc-4.7-667415.patch
-ldflags-to-ldadd.patch
-find-disk-device.patch
-modernize_autotools.patch
-fix_compiler_warnings.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmhdplop.git
More information about the Pkg-wmaker-commits
mailing list