Commit 02a355c0 authored by Axel Beckert's avatar Axel Beckert

Drop 03-parantheses-warnings.diff, refresh remaining patches

* Drop patch 03-parantheses-warnings.diff, obsoleted by upstream.
* Refresh remaining patches where needed.
parent 40d930a1
flwm (1.02+git2015.04.29-1) UNRELEASED; urgency=medium
* New upstream git snapshot.
+ Drop patch 03-parantheses-warnings.diff, obsoleted by upstream.
+ Refresh remaining patches where needed.
-- Axel Beckert <abe@debian.org> Thu, 30 Jul 2015 09:38:16 +0200
flwm (1.02+cvs20080422-11) unstable; urgency=medium
* Bump Standards-Version to 3.9.5 (no changes)
......
# Add Debian menu support.
diff -urNad flwm-1.01~/Menu.C flwm-1.01/Menu.C
--- flwm-1.01~/Menu.C 2006-06-30 09:02:01.000000000 +0200
+++ flwm-1.01/Menu.C 2006-06-30 09:02:05.000000000 +0200
@@ -393,7 +393,11 @@
Index: flwm/Menu.C
===================================================================
--- flwm.orig/Menu.C 2015-07-30 09:38:38.446906459 +0200
+++ flwm/Menu.C 2015-07-30 09:38:38.442906384 +0200
@@ -402,7 +402,11 @@
strcpy(path, home);
if (path[strlen(path)-1] != '/') strcat(path, "/");
strcat(path, ".wmx/");
......@@ -16,9 +17,10 @@ diff -urNad flwm-1.01~/Menu.C flwm-1.01/Menu.C
if (st.st_mtime == wmx_time) return;
wmx_time = st.st_mtime;
num_wmx = 0;
diff -urNad flwm-1.01~/flwm.1 flwm-1.01/flwm.1
--- flwm-1.01~/flwm.1 2006-06-30 09:02:01.000000000 +0200
+++ flwm-1.01/flwm.1 2006-06-30 09:02:05.000000000 +0200
Index: flwm/flwm.1
===================================================================
--- flwm.orig/flwm.1 2015-07-30 09:38:38.446906459 +0200
+++ flwm/flwm.1 2015-07-30 09:38:38.442906384 +0200
@@ -102,10 +102,13 @@
chmod +x !*
.fi
......
# Do not strip binaries for nostrip.
diff -urNad flwm-1.02~/Makefile flwm-1.02/Makefile
--- flwm-1.02~/Makefile 2007-08-12 18:37:59.000000000 +0200
+++ flwm-1.02/Makefile 2007-08-12 18:39:31.000000000 +0200
@@ -44,7 +44,7 @@
Index: flwm/Makefile
===================================================================
--- flwm.orig/Makefile 2015-07-30 09:39:04.803429742 +0200
+++ flwm/Makefile 2015-07-30 09:39:04.799429669 +0200
@@ -45,7 +45,7 @@
include makedepend
install: $(PROGRAM)
......
# This patch adds some parantheses in the code to avoid some compiler
# warnings.
diff -Naur flwm-1.02+cvs20080422.orig/Frame.C flwm-1.02+cvs20080422/Frame.C
--- flwm-1.02+cvs20080422.orig/Frame.C 2008-05-14 14:40:28.000000000 +0200
+++ flwm-1.02+cvs20080422/Frame.C 2008-05-14 14:43:34.000000000 +0200
@@ -915,7 +915,7 @@
// preserving stacking order:
for (p = &first; *p;) {
Frame* f = *p;
- if (f == this || f->is_transient_for(this) && f->state() != UNMAPPED) {
+ if (f == this || (f->is_transient_for(this) && f->state() != UNMAPPED)) {
*p = f->next; // remove it from list
if (previous) {
XWindowChanges w;
@@ -970,7 +970,7 @@
void Frame::iconize() {
for (Frame* c = first; c; c = c->next) {
- if (c == this || c->is_transient_for(this) && c->state() != UNMAPPED)
+ if (c == this || (c->is_transient_for(this) && c->state() != UNMAPPED))
c->state(ICONIC);
}
}
@@ -1163,7 +1163,7 @@
#endif
}
if (min_h == max_h || flag(KEEP_ASPECT|NO_RESIZE) ||
- !max_h_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM) {
+ (!max_h_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM)) {
max_h_button.hide();
} else {
max_h_button.position(BUTTON_LEFT,by);
@@ -1171,7 +1171,7 @@
by += BUTTON_H;
}
if (min_w == max_w || flag(KEEP_ASPECT|NO_RESIZE) ||
- !max_w_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM) {
+ (!max_w_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM)) {
max_w_button.hide();
} else {
max_w_button.position(BUTTON_LEFT,by);
@@ -1646,8 +1646,8 @@
nh = iy+ih-(Fl::event_y_root()-dy);
else {ny = y(); nh = h();}
if (flag(KEEP_ASPECT)) {
- if (nw-dwidth > nh-dwidth
- && (what&(FL_ALIGN_LEFT|FL_ALIGN_RIGHT))
+ if ((nw-dwidth > nh-dwidth
+ && (what&(FL_ALIGN_LEFT|FL_ALIGN_RIGHT)))
|| !(what&(FL_ALIGN_TOP|FL_ALIGN_BOTTOM)))
nh = nw-dwidth+dheight;
else
diff -Naur flwm-1.02+cvs20080422.orig/Hotkeys.C flwm-1.02+cvs20080422/Hotkeys.C
--- flwm-1.02+cvs20080422.orig/Hotkeys.C 2008-05-14 14:40:28.000000000 +0200
+++ flwm-1.02+cvs20080422/Hotkeys.C 2008-05-14 14:46:58.000000000 +0200
@@ -182,8 +182,8 @@
int Handle_Hotkey() {
for (int i = 0; keybindings[i].key; i++) {
if (Fl::test_shortcut(keybindings[i].key) ||
- (keybindings[i].key & 0xFFFF) == FL_Delete
- && Fl::event_key() == FL_BackSpace// fltk bug?
+ ((keybindings[i].key & 0xFFFF) == FL_Delete
+ && Fl::event_key() == FL_BackSpace)// fltk bug?
) {
keybindings[i].func();
return 1;
diff -Naur flwm-1.02+cvs20080422.orig/Menu.C flwm-1.02+cvs20080422/Menu.C
--- flwm-1.02+cvs20080422.orig/Menu.C 2008-05-14 14:40:28.000000000 +0200
+++ flwm-1.02+cvs20080422/Menu.C 2008-05-14 14:45:50.000000000 +0200
@@ -568,7 +568,7 @@
if (d == Desktop::current()) first_on_desk = menu+n;
for (c = Frame::first; c; c = c->next) {
if (c->state() == UNMAPPED || c->transient_for()) continue;
- if (c->desktop() == d || !c->desktop() && d == Desktop::current()) {
+ if (c->desktop() == d || (!c->desktop() && d == Desktop::current())) {
init(menu[n],(char*)c);
#if FL_MAJOR_VERSION < 2
init(menu[n],(char*)c);
# Remove some extra libs from linking. flwm do not need them.
diff -Naur flwm-1.02+cvs20080422.orig/configure.in flwm-1.02+cvs20080422/configure.in
--- flwm-1.02+cvs20080422.orig/configure.in 2008-09-06 11:04:25.000000000 +0200
+++ flwm-1.02+cvs20080422/configure.in 2008-09-06 11:06:51.000000000 +0200
@@ -16,7 +16,7 @@
Index: flwm/configure.in
===================================================================
--- flwm.orig/configure.in 2015-07-30 09:40:03.508595038 +0200
+++ flwm/configure.in 2015-07-30 09:40:03.504594954 +0200
@@ -15,7 +15,7 @@
LIBS="-lfltk2 -lXft -lXinerama -lXi $LIBS"
CXXFLAGS="$CXXFLAGS -I/usr/local/include/fltk/compat"
else
......@@ -12,10 +13,11 @@ diff -Naur flwm-1.02+cvs20080422.orig/configure.in flwm-1.02+cvs20080422/configu
fi
MAKEDEPEND="\$(CXX) -M"
diff -Naur flwm-1.02+cvs20080422.orig/makeinclude.in flwm-1.02+cvs20080422/makeinclude.in
--- flwm-1.02+cvs20080422.orig/makeinclude.in 2008-09-06 11:04:25.000000000 +0200
+++ flwm-1.02+cvs20080422/makeinclude.in 2008-09-06 11:05:02.000000000 +0200
@@ -19,6 +19,6 @@
Index: flwm/makeinclude.in
===================================================================
--- flwm.orig/makeinclude.in 2015-07-30 09:40:03.508595038 +0200
+++ flwm/makeinclude.in 2015-07-30 09:40:03.504594954 +0200
@@ -20,6 +20,6 @@
CXXFLAGS =@CXXFLAGS@
# libraries to link with:
......
# Let install also create the directorys if they are missing.
diff -Naur flwm-1.02+cvs20080422.orig/Makefile flwm-1.02+cvs20080422/Makefile
--- flwm-1.02+cvs20080422.orig/Makefile 2008-09-06 11:21:27.000000000 +0200
+++ flwm-1.02+cvs20080422/Makefile 2008-09-06 11:21:59.000000000 +0200
@@ -42,8 +42,8 @@
Index: flwm/Makefile
===================================================================
--- flwm.orig/Makefile 2015-07-30 09:40:12.104765644 +0200
+++ flwm/Makefile 2015-07-30 09:40:12.100765568 +0200
@@ -45,8 +45,8 @@
include makedepend
install: $(PROGRAM)
......
......@@ -6,9 +6,9 @@ Author: Stephen Carrier <stivc@mindspring.com>
Index: flwm/Frame.C
===================================================================
--- flwm.orig/Frame.C 2013-05-28 23:02:47.501387305 +0200
+++ flwm/Frame.C 2013-05-28 23:04:22.181784128 +0200
@@ -796,7 +796,7 @@
--- flwm.orig/Frame.C 2015-07-30 09:40:14.992822959 +0200
+++ flwm/Frame.C 2015-07-30 09:40:14.988822883 +0200
@@ -795,7 +795,7 @@
XSetWindowAttributes a;
a.background_pixel = fl_xpixel(FL_SELECTION_COLOR);
XChangeWindowAttributes(fl_display, fl_xid(this), CWBackPixel, &a);
......
01-debian-menu.diff
02-nostrip.diff
03-parantheses-warnings.diff
04-manpage-fixes.diff
05-remove-unneeded-linking.diff
06-create-dirs.diff
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment