[Pkg-wmaker-commits] [wmclock] 46/66: debian/patches: Remove directory; patches applied upstream.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 10:52:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmclock.
commit a65ba09429950072742162dea2253110dab3a33b
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Thu Dec 11 23:22:49 2014 -0600
debian/patches: Remove directory; patches applied upstream.
---
debian/patches/add_interval_option.patch | 147 -------------------------------
debian/patches/correct_year.patch | 18 ----
debian/patches/fix_12_year_display.patch | 24 -----
debian/patches/hardening.patch | 17 ----
debian/patches/manpage_fixes.patch | 19 ----
debian/patches/manpage_xpm_notes.patch | 30 -------
debian/patches/series | 6 --
7 files changed, 261 deletions(-)
diff --git a/debian/patches/add_interval_option.patch b/debian/patches/add_interval_option.patch
deleted file mode 100644
index 795e094..0000000
--- a/debian/patches/add_interval_option.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-Description: Add -interval option.
- The user has the ability to set the interval at which the clock blinks by
- using the -interval or --interval option with a given number of seconds. The
- default is 2 (1 on, 1 off), the traditional behavior of wmclock.
- .
- In order to have a blinking cycle with an odd number of seconds, nextEvent now
- keeps track of the next half-second instead of the next second.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Bug-Debian: http://bugs.debian.org/228986
-Last-Update: 2014-07-31
-
---- a/wmclock.c
-+++ b/wmclock.c
-@@ -146,6 +146,7 @@
- int enableBlinking = 1; /* default is blinking */
- int startIconified = 0; /* default is not iconified */
- int enableYearDisplay = 0; /* default is to show time, not year */
-+int blinkInterval = 2; /* default is a 2-second blink cycle */
-
- int timePos12[NUM_TIME_POSITIONS] = { 5, 14, 24, 28, 37 };
- int timePos24[NUM_TIME_POSITIONS] = { 4, 8, 17, 22, 31 };
-@@ -207,6 +208,7 @@
- " -24 show 24-hour time",
- " -year show year instead of time",
- " -noblink don't blink",
-+" -interval <seconds> set blink interval",
- " -exe <command> start <command> on mouse click",
- " -led <color> use <color> as color of led",
- #ifndef ONLY_SHAPED_WINDOW
-@@ -799,6 +801,16 @@
- {
- showUsage();
- }
-+ else if ((0 == strcmp(argv[i], "-interval")) ||
-+ (0 == strcmp(argv[i], "--interval")))
-+ {
-+ if (++i >= argc)
-+ {
-+ showUsage();
-+ }
-+ blinkInterval = atoi(argv[i]);
-+ }
-+
- else
- {
- fprintf(stderr, "%s: unrecognized option `%s'\n",
-@@ -822,6 +834,7 @@
- XClassHint classHint;
- Pixmap shapeMask;
- struct timeval nextEvent;
-+ unsigned int blinkCounter = 0;
-
- /* Parse command line options */
- progName = extractProgName(argv[0]);
-@@ -962,26 +975,6 @@
- redrawWindow(&visible);
- }
- }
-- if (enableBlinking && (!enableYearDisplay))
-- {
-- if (actualTime % 2)
-- {
-- /* Sekunden Doppelpunkt ein */
-- XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
-- COLON_X_OFFSET, COLON_Y_OFFSET,
-- COLON_WIDTH, COLON_HEIGHT,
-- xPos[COLON_X_POS], yPos[COLON_Y_POS]);
-- }
-- else
-- {
-- /* Sekunden Doppelpunkt aus */
-- XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
-- BLANK_X_OFFSET, BLANK_Y_OFFSET,
-- COLON_WIDTH, COLON_HEIGHT,
-- xPos[COLON_X_POS], yPos[COLON_Y_POS]);
-- }
-- redrawWindow(&visible);
-- }
- if (0 == (actualTime % 2))
- {
- /* Clean up zombie processes */
-@@ -995,7 +988,38 @@
- }
- }
- }
--
-+ if (enableBlinking && (!enableYearDisplay))
-+ {
-+ blinkCounter++;
-+#ifdef SYSV
-+ if (blinkCounter >= 20*blinkInterval)
-+#else
-+ if (blinkCounter >= 2*blinkInterval)
-+#endif
-+ blinkCounter = 0;
-+ if (blinkCounter == 0)
-+ {
-+ /* Sekunden Doppelpunkt ein */
-+ XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
-+ COLON_X_OFFSET, COLON_Y_OFFSET,
-+ COLON_WIDTH, COLON_HEIGHT,
-+ xPos[COLON_X_POS], yPos[COLON_Y_POS]);
-+ }
-+#ifdef SYSV
-+ if (blinkCounter == 10*blinkInterval)
-+#else
-+ if (blinkCounter == blinkInterval)
-+#endif
-+ {
-+ /* Sekunden Doppelpunkt aus */
-+ XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
-+ BLANK_X_OFFSET, BLANK_Y_OFFSET,
-+ COLON_WIDTH, COLON_HEIGHT,
-+ xPos[COLON_X_POS], yPos[COLON_Y_POS]);
-+ }
-+ redrawWindow(&visible);
-+ }
-+
- /* read a packet */
- while (XPending(dpy))
- {
-@@ -1075,7 +1099,10 @@
- {
- gettimeofday(&nextEvent,NULL);
- nextEvent.tv_sec = 0;
-- nextEvent.tv_usec = 1000000-nextEvent.tv_usec;
-+ if (nextEvent.tv_usec < 500000)
-+ nextEvent.tv_usec = 500000-nextEvent.tv_usec;
-+ else
-+ nextEvent.tv_usec = 1000000-nextEvent.tv_usec;
- }
- else
- {
---- a/wmclock.man.in
-+++ b/wmclock.man.in
-@@ -61,6 +61,11 @@
- by default. This option turns off the blinking and displays a steadily
- lit separator instead.
- .TP
-+\fB\-interval\fI n\fR
-+Set the blink cycle to
-+.I n
-+seconds. The default is 2 (1 second on, 1 second off).
-+.TP
- \fB\-version\fB
- Displays the version of Wmclock.
- .TP
diff --git a/debian/patches/correct_year.patch b/debian/patches/correct_year.patch
deleted file mode 100644
index fea13a2..0000000
--- a/debian/patches/correct_year.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: <short summary of the patch>
- When the -year option is selected, the 4th digit of the year is used in place
-of the 2nd digit. This is due to a typo in the showYear function.
-
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Bug-Debian: http://bugs.debian.org/723887
-
---- wmclock-1.0.14.orig/wmclock.c
-+++ wmclock-1.0.14/wmclock.c
-@@ -490,7 +490,7 @@ void showYear(void)
- XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
- digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
- xPos[DIGIT_1_X_POS], yPos[DIGIT_Y_POS]);
-- digitXOffset = LED_NUM_WIDTH * ((year % 100) % 10);
-+ digitXOffset = LED_NUM_WIDTH * ((year / 100) % 10);
- XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
- digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
- xPos[DIGIT_2_X_POS], yPos[DIGIT_Y_POS]);
diff --git a/debian/patches/fix_12_year_display.patch b/debian/patches/fix_12_year_display.patch
deleted file mode 100644
index 2760941..0000000
--- a/debian/patches/fix_12_year_display.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix display when both -12 and -year are given
-Author: Vino Fernando Crescini <jcrescin at cit.uws.edu.au>
-Bug-Debian: http://bugs.debian.org/228985
-
-Index: wmclock-1.0.14/wmclock.c
-===================================================================
---- wmclock-1.0.14.orig/wmclock.c 2010-12-22 13:12:28.000000000 +0100
-+++ wmclock-1.0.14/wmclock.c 2011-06-02 12:11:51.233840631 +0200
-@@ -849,7 +849,14 @@
- #endif /* !ONLY_SHAPED_WINDOW */
- for (i = 0; i < NUM_TIME_POSITIONS; i++)
- {
-- xPos[i] += enable12HourClock ? timePos24[i] : timePos12[i];
-+ if (enable12HourClock && (!enableYearDisplay))
-+ {
-+ xPos[i] += timePos24[i];
-+ }
-+ else
-+ {
-+ xPos[i] += timePos12[i];
-+ }
- }
-
- /* Open the display */
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
deleted file mode 100644
index 176f52e..0000000
--- a/debian/patches/hardening.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Import LDFLAGS for hardening
- This patch fixes the hardening-no-relro Lintian warning by appending the
- LDFLAGS from dpkg-buildflags to the LDOPTIONS variable used by imake.
- See https://wiki.debian.org/Hardening for more information.
-Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-
---- wmclock-1.0.14.orig/Imakefile
-+++ wmclock-1.0.14/Imakefile
-@@ -7,6 +7,8 @@ CFLAGS += -Wall -pedantic -Wshad
- CFLAGS += -Wcast-qual -Wchar-subscripts -Wpointer-arith
- CFLAGS += -Wredundant-decls -Wstrict-prototypes
-
-+LDOPTIONS += $(LDFLAGS)
-+
- XPMLIB = -L$(PREFIX)/lib/X11 -lXpm
- DEPLIBS = $(DEPXLIB)
-
diff --git a/debian/patches/manpage_fixes.patch b/debian/patches/manpage_fixes.patch
deleted file mode 100644
index 38fbf46..0000000
--- a/debian/patches/manpage_fixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Manpage fixes
- Fix first line and use proper escape sequence for (c) character.
-Author: Sandro Tosi <matrixhasu at gmail.com>
-
-Index: wmclock-1.0.14/wmclock.man.in
-===================================================================
---- wmclock-1.0.14.orig/wmclock.man.in 2010-12-22 13:12:19.000000000 +0100
-+++ wmclock-1.0.14/wmclock.man.in 2011-06-02 12:11:40.157887000 +0200
-@@ -24,9 +24,7 @@
- .TH wmclock 1x "@DATE@" "Version @VERSION@"
- .\" ----------------------------------------------------------------
- .SH NAME
--.PP
--.BR wmclock :
--a dockable clock for the Window Maker window manager
-+wmclock \- A dockable clock for the Window Maker window manager
- .\" ----------------------------------------------------------------
- .SH SYNOPSIS
- .HP
diff --git a/debian/patches/manpage_xpm_notes.patch b/debian/patches/manpage_xpm_notes.patch
deleted file mode 100644
index 5662d7e..0000000
--- a/debian/patches/manpage_xpm_notes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Document Debian-specific XPM files location
- Add a section about usage of translated XPM files in Debian.
-Author: Sandro Tosi <matrixhasu at gmail.com>
-
-Index: wmclock-1.0.14/wmclock.man.in
-===================================================================
---- wmclock-1.0.14.orig/wmclock.man.in 2011-06-02 12:11:40.157887000 +0200
-+++ wmclock-1.0.14/wmclock.man.in 2011-06-02 12:11:45.337865330 +0200
-@@ -160,6 +160,21 @@
- the bottom. The weekday abbreviations must also be arranged
- vertically, beginning with Monday at the top and continuing to Sunday
- at the bottom.
-+.PP
-+On Debian systems you can find XPM files for a variety of languages in:
-+.PP
-+.RS
-+.BR /usr/share/wmclock/
-+.RE
-+.PP
-+For example, to have a French display, you could use the following
-+command line:
-+.PP
-+.RS
-+.TQ
-+wmclock \-monthxpm /usr/share/wmclock/lang.french/month.xpm \-weekdayxpm /usr/share/wmclock/lang.french/weekday.xpm
-+.RE
-+.PP
- .SS Obsolete Options
- .PP
- In order to maintain command-line compatibility (mostly) with
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 26f2fa7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-manpage_fixes.patch
-manpage_xpm_notes.patch
-fix_12_year_display.patch
-correct_year.patch
-hardening.patch
-add_interval_option.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmclock.git
More information about the Pkg-wmaker-commits
mailing list