[Pkg-wmaker-commits] [wmstickynotes] 65/81: debian/patches: Remove directory; patches applied upstream.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Tue Aug 25 02:33:53 UTC 2015


This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmstickynotes.

commit 8a063a66b14296abe073cdea35f356dde6f76cf7
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Wed May 27 18:29:18 2015 -0500

    debian/patches: Remove directory; patches applied upstream.
---
 debian/patches/fix_-Wunused-result.patch | 29 -----------------------------
 debian/patches/fix_icon_size.patch       | 22 ----------------------
 debian/patches/series                    |  2 --
 3 files changed, 53 deletions(-)

diff --git a/debian/patches/fix_-Wunused-result.patch b/debian/patches/fix_-Wunused-result.patch
deleted file mode 100644
index 99e2d28..0000000
--- a/debian/patches/fix_-Wunused-result.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix -Wunused-result compiler warnings.
- In particular, print warning messages if we fail to parse note files.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2015-01-28
-
---- a/wmstickynotes.c
-+++ b/wmstickynotes.c
-@@ -412,12 +412,18 @@
- 		note->id = atoi(entry->d_name);
- 		if(note->id > highest_note_id) highest_note_id = note->id;
- 
--		fscanf(file, "%d,%d,%d,%d,%d,%d,",
-+		if (fscanf(file, "%d,%d,%d,%d,%d,%d,",
- 			&(note->x), &(note->y), &(note->width), &(note->height),
--			&reserved1, &reserved2);
-+			&reserved1, &reserved2) < 6) {
-+			fprintf(stderr, "Failed to parse note %s: too few values", entry->d_name);
-+			continue;
-+		}
- 
- 		/* Get color name */
--		fgets(buffer, 256, file);
-+		if (fgets(buffer, 256, file) == NULL) {
-+			fprintf(stderr, "Failed to parse note %s: no color", entry->d_name);
-+			continue;
-+		}
- 		/* Replace the newline with a null char */
- 		buffer[strlen(buffer) - 1] = '\0';
- 
diff --git a/debian/patches/fix_icon_size.patch b/debian/patches/fix_icon_size.patch
deleted file mode 100644
index c6cc08c..0000000
--- a/debian/patches/fix_icon_size.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix icon size.
- The wmstickynotes window fills a Window Maker icon entirely at 64x64
- pixels.  This results in a number of issues.  In particular, the user
- cannot click on the outside of the icon to move it or access the menu.
- Also, the default GTK theme window background appears around the edges
- instead of the Window Maker icon theme.
- .
- We fix this by setting the window to be 48x48 pixels.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2015-01-28
-
---- a/wmstickynotes.c
-+++ b/wmstickynotes.c
-@@ -141,7 +141,7 @@
- 	colormap = gdk_colormap_new(gdk_visual_get_system(), TRUE);
- 
- 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
--	gtk_window_set_default_size(GTK_WINDOW(window), 64, 64);
-+	gtk_window_set_default_size(GTK_WINDOW(window), 48, 48);
- 
- 	box = gtk_event_box_new();
- 	gtk_container_add(GTK_CONTAINER (window), box);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 700ce64..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix_icon_size.patch
-fix_-Wunused-result.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmstickynotes.git



More information about the Pkg-wmaker-commits mailing list