summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/dependencies
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-12-11 13:48:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-12-11 13:48:26 -0600
commit809e08d1a36f07c5b3394fa77c440cf9a0570f1d (patch)
tree868f3463af72e597805565229bd582e9bce69ac6 /ubuntu/maverick/dependencies
parente12b7beacb145e0359e66ec5d4cfc0494d3ca908 (diff)
downloadtde-packaging-809e08d1a36f07c5b3394fa77c440cf9a0570f1d.tar.gz
tde-packaging-809e08d1a36f07c5b3394fa77c440cf9a0570f1d.zip
Remove kubuntu_06_fglrx_0_size_screen.diff as it is already incorporated upstream
Diffstat (limited to 'ubuntu/maverick/dependencies')
-rw-r--r--ubuntu/maverick/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff32
-rw-r--r--ubuntu/maverick/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff32
2 files changed, 0 insertions, 64 deletions
diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/ubuntu/maverick/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
deleted file mode 100644
index 3c6394f33..000000000
--- a/ubuntu/maverick/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## kubuntu_06_fglrx_0_size_screen.diff.dpatch by <jr@pechin3>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp
---- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:06:28.000000000 +0100
-+++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:12:10.000000000 +0100
-@@ -526,11 +526,16 @@
- Q_CHECK_PTR( dpisX );
- Q_CHECK_PTR( dpisY );
- for ( i = 0; i < screens; i++ ) {
-- dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
--
-- / (DisplayWidthMM(dpy,i)*10);
-- dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
-- / (DisplayHeightMM(dpy,i)*10);
-+ if (DisplayWidthMM(dpy,i) < 1)
-+ dpisX[ i ] = 75; // default the dpi to 75.
-+ else
-+ dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
-+ / (DisplayWidthMM(dpy,i)*10);
-+ if (DisplayHeightMM(dpy,i) < 1)
-+ dpisY[ i ] = 75; // default the dpi to 75.
-+ else
-+ dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
-+ / (DisplayHeightMM(dpy,i)*10);
- }
- }
-
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/ubuntu/maverick/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
deleted file mode 100644
index 3c6394f33..000000000
--- a/ubuntu/maverick/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## kubuntu_06_fglrx_0_size_screen.diff.dpatch by <jr@pechin3>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp
---- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:06:28.000000000 +0100
-+++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:12:10.000000000 +0100
-@@ -526,11 +526,16 @@
- Q_CHECK_PTR( dpisX );
- Q_CHECK_PTR( dpisY );
- for ( i = 0; i < screens; i++ ) {
-- dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
--
-- / (DisplayWidthMM(dpy,i)*10);
-- dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
-- / (DisplayHeightMM(dpy,i)*10);
-+ if (DisplayWidthMM(dpy,i) < 1)
-+ dpisX[ i ] = 75; // default the dpi to 75.
-+ else
-+ dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
-+ / (DisplayWidthMM(dpy,i)*10);
-+ if (DisplayHeightMM(dpy,i) < 1)
-+ dpisY[ i ] = 75; // default the dpi to 75.
-+ else
-+ dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
-+ / (DisplayHeightMM(dpy,i)*10);
- }
- }
-