Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-06-09 09:16:19 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2018-06-09 09:16:19 +0200
commit88afd6b317bba25361062a75949a6f640f5fa7bf (patch)
treef1215109e29bdff93d0ff0e4b9ccb5e2c6f1f416 /extra
parente69aed42a064bcb500ce3d1295c90702bac18aac (diff)
extra/icewm: removed all patching, upstream version 1.4.2 is all fine
Diffstat (limited to 'extra')
-rw-r--r--extra/icewm/PKGBUILD21
-rw-r--r--extra/icewm/icewm-1.3.8-narrowing-casts.patch21
-rw-r--r--extra/icewm/icewm-1.3.8-pixmap-null-ref.patch25
3 files changed, 0 insertions, 67 deletions
diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD
deleted file mode 100644
index ce05a633..00000000
--- a/extra/icewm/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# compilation issues with narrowing -1 initializations
-source+=('icewm-1.3.8-narrowing-casts.patch')
-sha1sums+=('d8a296356884a3318f2436c035425e22bf94f15c')
-
-eval "$(
- declare -f prepare | \
- sed '
- /remain_power.patch/a patch -Np1 -i ${srcdir}/icewm-1.3.8-narrowing-casts.patch
- '
-)"
-
-# segfaults when derefenecing null refs in initializePixmaps
-source+=('icewm-1.3.8-pixmap-null-ref.patch')
-sha1sums+=('ed74d1fb9614c42a110eeb546ea51fcf17f99f30')
-
-eval "$(
- declare -f prepare | \
- sed '
- /narrowing-casts.patch/a patch -Np1 -i ${srcdir}/icewm-1.3.8-pixmap-null-ref.patch
- '
-)"
diff --git a/extra/icewm/icewm-1.3.8-narrowing-casts.patch b/extra/icewm/icewm-1.3.8-narrowing-casts.patch
deleted file mode 100644
index 7912d6ae..00000000
--- a/extra/icewm/icewm-1.3.8-narrowing-casts.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rauN icewm-1.3.8/src/icesh.cc icewm-1.3.8-narrowing-casts-patch/src/icesh.cc
---- icewm-1.3.8/src/icesh.cc 2013-11-17 17:54:39.000000000 +0100
-+++ icewm-1.3.8-narrowing-casts-patch/src/icesh.cc 2018-06-06 17:03:27.154963162 +0200
-@@ -245,7 +245,7 @@
- };
-
- SymbolTable layers = {
-- layerIdentifiers, 0, WinLayerCount - 1, WinLayerInvalid
-+ layerIdentifiers, 0, WinLayerCount - 1, (long int)WinLayerInvalid
- };
-
- SymbolTable states = {
-@@ -257,7 +257,7 @@
- };
-
- SymbolTable trayOptions = {
-- trayOptionIdentifiers, 0, WinTrayOptionCount - 1, WinTrayInvalid
-+ trayOptionIdentifiers, 0, WinTrayOptionCount - 1, (long int)WinTrayInvalid
- };
-
- /******************************************************************************/
diff --git a/extra/icewm/icewm-1.3.8-pixmap-null-ref.patch b/extra/icewm/icewm-1.3.8-pixmap-null-ref.patch
deleted file mode 100644
index fc44b054..00000000
--- a/extra/icewm/icewm-1.3.8-pixmap-null-ref.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -rauN icewm-1.3.8/src/wmapp.cc icewm-1.3.8-pixmap-null-ref-patch/src/wmapp.cc
---- icewm-1.3.8/src/wmapp.cc 2013-11-17 17:54:39.000000000 +0100
-+++ icewm-1.3.8-pixmap-null-ref-patch/src/wmapp.cc 2018-06-06 21:30:29.778296503 +0200
-@@ -621,14 +620,14 @@
-
- for (int a = 0; a <= 1; a++) {
- for (int b = 0; b <= 1; b++) {
-- frameT[a][b]->replicate(true, copyMask);
-- frameB[a][b]->replicate(true, copyMask);
-- frameL[a][b]->replicate(false, copyMask);
-- frameR[a][b]->replicate(false, copyMask);
-+ if( frameT[a][b] != null ) frameT[a][b]->replicate(true, copyMask);
-+ if( frameB[a][b] != null ) frameB[a][b]->replicate(true, copyMask);
-+ if( frameL[a][b] != null ) frameL[a][b]->replicate(false, copyMask);
-+ if( frameR[a][b] != null ) frameR[a][b]->replicate(false, copyMask);
- }
-- titleS[a]->replicate(true, copyMask);
-- titleT[a]->replicate(true, copyMask);
-- titleB[a]->replicate(true, copyMask);
-+ if( titleS[a] != null ) titleS[a]->replicate(true, copyMask);
-+ if( titleT[a] != null ) titleT[a]->replicate(true, copyMask);
-+ if( titleB[a] != null ) titleB[a]->replicate(true, copyMask);
- }
-
- menuButton[0] = paths->loadPixmap(0, "menuButtonI.xpm");