[Pkg-wmaker-commits] [wmcube] 28/67: debian/patches: Remove old dpatch patches.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 25 03:22:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmcube.
commit f69130dde77e7f9d43e7b807acb5991b3c43ead5
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sun Jan 11 11:10:16 2015 -0600
debian/patches: Remove old dpatch patches.
---
debian/patches/00list | 5 -
.../patches/10_fixes_for_0.99pre1_upgrade.dpatch | 112 ---------------------
debian/patches/20_parallel_build.dpatch | 39 -------
debian/patches/30_bts-386850_fix_smp.dpatch | 34 -------
.../patches/40_bts-357072_long_uptime_fix.dpatch | 32 ------
.../patches/50_bts-504844_fix_ftbfs_gcc4.4.dpatch | 18 ----
6 files changed, 240 deletions(-)
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5d21c0a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-10_fixes_for_0.99pre1_upgrade.dpatch
-20_parallel_build
-30_bts-386850_fix_smp
-40_bts-357072_long_uptime_fix
-50_bts-504844_fix_ftbfs_gcc4.4
diff --git a/debian/patches/10_fixes_for_0.99pre1_upgrade.dpatch b/debian/patches/10_fixes_for_0.99pre1_upgrade.dpatch
deleted file mode 100644
index 2ea88ba..0000000
--- a/debian/patches/10_fixes_for_0.99pre1_upgrade.dpatch
+++ /dev/null
@@ -1,112 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fixes_for_0.99pre1_upgrade.dpatch by Peter De Wachter <pdewacht at gmail.comq>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes 0.99pre1 release to compile on a debian system
-
- at DPATCH@
-
-Index: wmcube-0.99-pre1/Makefile
-===================================================================
---- wmcube-0.99-pre1.orig/Makefile 2008-01-28 23:06:48.000000000 +0100
-+++ wmcube-0.99-pre1/Makefile 2008-01-28 23:08:04.000000000 +0100
-@@ -11,7 +11,7 @@
- #
- #
- CXX= g++
--CXXFLAGS=-O2 -DLINUX
-+CXXFLAGS=-O2 -DLINUX -Wno-write-strings
- CPUMONCC_OS=linux
- WMCUBE_LIBS=-Lwmapp -lwmapp -Lcpumoncc/$(CPUMONCC_OS) -lcpumoncc
- LFLAGS=$(WMCUBE_LIBS) -L/usr/X11R6/lib -lXpm -lXext -lX11
-Index: wmcube-0.99-pre1/wmapp/Makefile
-===================================================================
---- wmcube-0.99-pre1.orig/wmapp/Makefile 2008-01-28 23:09:04.000000000 +0100
-+++ wmcube-0.99-pre1/wmapp/Makefile 2008-01-28 23:10:45.000000000 +0100
-@@ -1,5 +1,5 @@
- export CXX = g++
--export CFLAGS = -fPIC -g -Wall -pedantic -O2
-+export CFLAGS = -fPIC -g -Wall -Wno-write-strings -O2
- export LFLAGS = -L$(CURDIR) -L/usr/X11R6/lib -lXpm -lXext -lX11 -lwmapp
-
- SOURCES = $(wildcard *.cc)
-Index: wmcube-0.99-pre1/cpumoncc/linux/CpuMonitor.cc
-===================================================================
---- wmcube-0.99-pre1.orig/cpumoncc/linux/CpuMonitor.cc 2008-01-28 23:09:59.000000000 +0100
-+++ wmcube-0.99-pre1/cpumoncc/linux/CpuMonitor.cc 2008-01-28 23:10:12.000000000 +0100
-@@ -23,6 +23,7 @@
- // CpuMonitorCC/Linux
-
- #include <stdio.h>
-+#include <string.h>
- #include "CpuMonitor.h"
-
- CpuMonitor::CpuMonitor() : BaseCpuMonitor()
-Index: wmcube-0.99-pre1/wmapp/xwrapper.h
-===================================================================
---- wmcube-0.99-pre1.orig/wmapp/xwrapper.h 2008-01-28 23:11:03.000000000 +0100
-+++ wmcube-0.99-pre1/wmapp/xwrapper.h 2008-01-28 23:16:40.000000000 +0100
-@@ -16,11 +16,6 @@
- // prefix must be avoided when using them. Still, it is nice to use
- // a separate namespace whenever possible.
-
-- // the next line ensures that X macros are expanded correctly into functions
-- // in the X namespace, since _XPrivDisplay appears to be the only
-- // real X object used by all X macros:
--# define _XPrivDisplay X::_XPrivDisplay
--
- // this is just so I can easily see which identifiers are macros from Xlib
- // that can't be prefixed by "X::"
- # define X_MACRO(x) (x)
-@@ -33,6 +28,8 @@
- }
- };
-
-+using X::_XPrivDisplay; //only slightly less evil than the original hack
-+
- // forward declaration for rectangle
- struct WMRectangle;
-
-Index: wmcube-0.99-pre1/wmapp/wmapp.cc
-===================================================================
---- wmcube-0.99-pre1.orig/wmapp/wmapp.cc 2008-01-28 23:11:47.000000000 +0100
-+++ wmcube-0.99-pre1/wmapp/wmapp.cc 2008-01-28 23:12:17.000000000 +0100
-@@ -1,13 +1,13 @@
- #include <string>
-+#include <string.h>
-+#include <unistd.h>
- #include "wmapp.h"
- #include "wmwindow.h"
-
- using std::string;
-
- namespace Unix {
-- extern "C" {
--# include <unistd.h> // for usleep()
-- }
-+ using ::usleep;
- };
-
- // All the xpms we need:
-Index: wmcube-0.99-pre1/wmapp/wmwindow.cc
-===================================================================
---- wmcube-0.99-pre1.orig/wmapp/wmwindow.cc 2008-01-28 23:12:58.000000000 +0100
-+++ wmcube-0.99-pre1/wmapp/wmwindow.cc 2008-01-28 23:13:03.000000000 +0100
-@@ -1,4 +1,5 @@
- #include <iostream>
-+#include <string.h>
- #include "wmwindow.h"
- #include "wmapp.h"
-
-Index: wmcube-0.99-pre1/wmcube.cc
-===================================================================
---- wmcube-0.99-pre1.orig/wmcube.cc 2008-01-28 23:12:38.000000000 +0100
-+++ wmcube-0.99-pre1/wmcube.cc 2008-01-28 23:12:44.000000000 +0100
-@@ -6,6 +6,7 @@
- #include <vector>
- #include <math.h>
- #include <unistd.h>
-+#include <string.h>
-
- #include "WmcObject.h"
- #include "wmcube.h"
diff --git a/debian/patches/20_parallel_build.dpatch b/debian/patches/20_parallel_build.dpatch
deleted file mode 100644
index d1d9040..0000000
--- a/debian/patches/20_parallel_build.dpatch
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_parallel_build.dpatch by Sandro Tosi <matrixhasu at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to allow parallel build
-
- at DPATCH@
-diff -urNad wmcube~/Makefile wmcube/Makefile
---- wmcube~/Makefile 2008-01-30 00:03:47.985006396 +0100
-+++ wmcube/Makefile 2008-01-30 00:04:16.770646797 +0100
-@@ -32,7 +32,7 @@
- @@echo "# Please modify/verify the makefile in that directory before"
- @@echo "# reporting an error as a bug."
- @@echo "###############################################################"
-- cd cpumoncc/$(CPUMONCC_OS); make; cd ../..
-+ cd cpumoncc/$(CPUMONCC_OS); $(MAKE); cd ../..
-
- wmapp/libwmapp.a:
- @@echo "###############################################################"
-@@ -40,7 +40,7 @@
- @@echo "# Please modify/verify the makefile in that directory before"
- @@echo "# reporting an error as a bug."
- @@echo "###############################################################"
-- cd wmapp; make; cd ..
-+ cd wmapp; $(MAKE); cd ..
-
- install: $(TARGET)
- cp -Rf wmc /usr/share/wmcube
-@@ -50,8 +50,8 @@
-
- clean:
- rm -f *.o *\~ $(TARGET)
-- cd wmapp; make clean; cd ..
-- cd cpumoncc/$(CPUMONCC_OS); make clean; cd ../..
-+ cd wmapp; $(MAKE) clean; cd ..
-+ cd cpumoncc/$(CPUMONCC_OS); $(MAKE) clean; cd ../..
-
- install_clean:
- rm -fr /usr/share/wmcube
diff --git a/debian/patches/30_bts-386850_fix_smp.dpatch b/debian/patches/30_bts-386850_fix_smp.dpatch
deleted file mode 100644
index dfb1204..0000000
--- a/debian/patches/30_bts-386850_fix_smp.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_bts-386850_fix_smp.dpatch by Sandro Tosi <matrixhasu at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: BTS 386850, fix smp support, reading all the fields in /proc/stat
-
- at DPATCH@
-diff -urNad wmcube~/cpumoncc/linux/CpuMonitor.cc wmcube/cpumoncc/linux/CpuMonitor.cc
---- wmcube~/cpumoncc/linux/CpuMonitor.cc 2008-01-30 02:11:55.463090804 +0100
-+++ wmcube/cpumoncc/linux/CpuMonitor.cc 2008-01-30 02:12:56.102546452 +0100
-@@ -62,7 +62,7 @@
-
- for (i = -2; i < which_cpu; i++)
- {
-- fscanf(fp, "%5s %31s %31s %31s %31s", cpuid, tmp, tmp, tmp, tmp);
-+ fscanf(fp, "%5s %31s %31s %31s %31s %31s %31s %31s %31s", cpuid, tmp, tmp, tmp, tmp, tmp, tmp, tmp, tmp);
- //fscanf(fp, "%5s" , cpuid); printf("%s ", cpuid);
- //fscanf(fp, "%31s", tmp ); printf("%s ", tmp);
- //fscanf(fp, "%31s", tmp ); printf("%s ", tmp);
-@@ -80,12 +80,13 @@
- char cpuid[6];
- int cpu,nice,system,idle;
- float t;
-+ char tmp[32];
- FILE *fp;
-
- fp = fopen("/proc/stat","r");
-
- for (i = -2; i < which_cpu; i++)
-- fscanf(fp,"%5s %d %d %d %d", cpuid, &cpu, &nice, &system, &idle);
-+ fscanf(fp,"%5s %d %d %d %d %31s %31s %31s %31s", cpuid, &cpu, &nice, &system, &idle, tmp, tmp, tmp, tmp);
-
- fclose(fp);
-
diff --git a/debian/patches/40_bts-357072_long_uptime_fix.dpatch b/debian/patches/40_bts-357072_long_uptime_fix.dpatch
deleted file mode 100644
index fb1ceed..0000000
--- a/debian/patches/40_bts-357072_long_uptime_fix.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_bts-357072_long_uptime_fix.dpatch by Sandro Tosi <matrixhasu at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix execution on machine with long uptime, using unsigned int
-
- at DPATCH@
-diff -urNad wmcube~/cpumoncc/linux/CpuMonitor.cc wmcube/cpumoncc/linux/CpuMonitor.cc
---- wmcube~/cpumoncc/linux/CpuMonitor.cc 2008-01-30 20:32:42.762911925 +0100
-+++ wmcube/cpumoncc/linux/CpuMonitor.cc 2008-01-30 20:32:54.135560012 +0100
-@@ -76,9 +76,10 @@
-
- float CpuMonitor::getLoad()
- {
-- int total, used, i;
-+ unsigned int total, used;
-+ int i;
- char cpuid[6];
-- int cpu,nice,system,idle;
-+ unsigned int cpu,nice,system,idle;
- float t;
- char tmp[32];
- FILE *fp;
-@@ -86,7 +87,7 @@
- fp = fopen("/proc/stat","r");
-
- for (i = -2; i < which_cpu; i++)
-- fscanf(fp,"%5s %d %d %d %d %31s %31s %31s %31s", cpuid, &cpu, &nice, &system, &idle, tmp, tmp, tmp, tmp);
-+ fscanf(fp,"%5s %u %u %u %u %31s %31s %31s %31s", cpuid, &cpu, &nice, &system, &idle, tmp, tmp, tmp, tmp);
-
- fclose(fp);
-
diff --git a/debian/patches/50_bts-504844_fix_ftbfs_gcc4.4.dpatch b/debian/patches/50_bts-504844_fix_ftbfs_gcc4.4.dpatch
deleted file mode 100644
index 059063b..0000000
--- a/debian/patches/50_bts-504844_fix_ftbfs_gcc4.4.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_bts-504844_fix_ftbfs_gcc4.4.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a FTBS using GCC 4.4; patch provided by Martin Michlmayr
-
- at DPATCH@
-diff -urNad wmcube~/WmcObject.cc wmcube/WmcObject.cc
---- wmcube~/WmcObject.cc 2007-12-28 18:57:12.000000000 +0100
-+++ wmcube/WmcObject.cc 2008-11-08 11:11:16.763107536 +0100
-@@ -1,6 +1,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-+#include <cstdio>
- #include <iostream>
- #include <stdexcept>
- #include <vector>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcube.git
More information about the Pkg-wmaker-commits
mailing list