Author: ranger
Date: Sun Dec 17 02:11:41 2006
New Revision: 537
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=537&repname=user%3a+ranger>
Log:
proper fix for the dpms issue with apple x11
Modified:
trunk/experimental/10.3/main/finkinfo/kde/koffice.info
trunk/experimental/10.3/main/finkinfo/kde/koffice.patch
trunk/experimental/10.4/main/finkinfo/kde/koffice.info
trunk/experimental/10.4/main/finkinfo/kde/koffice.patch
trunk/experimental/common/main/finkinfo/kde/koffice.info
trunk/experimental/common/main/finkinfo/kde/koffice.patch
Modified: trunk/experimental/10.3/main/finkinfo/kde/koffice.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/kde/koffice.info&rev=537&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/kde/koffice.info (original)
+++ trunk/experimental/10.3/main/finkinfo/kde/koffice.info Sun Dec 17 02:11:41
2006
@@ -6,7 +6,7 @@
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: karbon (>= %v-%r), kchart (>= %v-%r), kexi (>= %v-%r), kformula (>=
%v-%r), kivio (>= %v-%r), kpresenter (>= %v-%r), krita (>= %v-%r), kspread (>=
%v-%r), kugar (>= %v-%r), kword (>= %v-%r), kplato (>= %v-%r)
-BuildDepends: arts-dev (>= 1.4.3-11), aspell, aspell-dev, audiofile, autoconf
(>= 2.60-1), cctools-single-module, esound, expat1, fink (>= 0.24-1),
flex-devel, freetype219, libgettext3-dev, gettext-tools, glib2 (>= 2.8.6-1),
glib2-dev (>= 2.8.6-1), imagemagick, imagemagick-dev, kdelibs3-unified-dev (>=
3.4.3-11), kjsembed-dev, lcms, libart2, libexif12, libgsf-dev, libiconv-dev,
libidn, libjpeg, libogg, libpaper1-dev, libpng3 (>= 1.2.5-4), libpqxx2-dev,
libtiff, libtool14, libvorbis0, libwpd-0.8-dev, libxml2 (>= 2.5.2-1), libxslt
(>= 1.0.27-1), libmad, macosx (>= 10.3.9-1), mysql14-dev, openexr-dev, pcre,
pkgconfig, poppler-qt3, poppler1, postgresql81-dev, python24, qt3 (>=
3.3.6-17), ruby18-dev, sqlite3-dev, system-openssl-dev, wv2 (>= 0.2.1-1),
unsermake (>= 0.4-0.20060316.1), x11-dev
+BuildDepends: arts-dev (>= 1.4.3-11), aspell, aspell-dev, audiofile, autoconf
(>= 2.60-1), cctools-single-module, esound, expat1, fink (>= 0.24-1),
flex-devel, freetype219, libgettext3-dev, gettext-tools, glib2 (>= 2.8.6-1),
glib2-dev (>= 2.8.6-1), imagemagick, imagemagick-dev, kdelibs3-unified-dev (>=
3.4.3-11), kjsembed-dev, lcms, libart2, libexif12, libgsf-dev, libiconv-dev,
libidn, libjpeg, libogg, libpaper1-dev, libpng3 (>= 1.2.5-4), libpqxx2 (>=
2.6.8-1), libtiff, libtool14, libvorbis0, libwpd-0.8-dev, libxml2 (>= 2.5.2-1),
libxslt (>= 1.0.27-1), libmad, macosx (>= 10.3.9-1), mysql14-dev, openexr-dev,
pcre, pkgconfig, poppler-qt3, poppler1, postgresql82-dev, python24, qt3 (>=
3.3.6-17), ruby18-dev, sqlite3-dev, system-openssl-dev, wv2 (>= 0.2.1-1),
unsermake (>= 0.4-0.20060316.1), x11-dev
Replaces: %N-common (<< %v-%r), %N-dev (<< %v-%r)
GCC: 3.3
@@ -26,7 +26,7 @@
NoSetLDFLAGS: true
ConfigureParams: --enable-mysql --enable-pgsql
--with-pgsqlincdir=%p/include/postgresql --with-pgsqllibdir=%p/lib
--with-pqxx-includes=%p/include --with-pqxx-libraries=%p/lib
--with-distribution='Fink/Mac OS X'
CompileScript: <<
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
@@ -45,7 +45,7 @@
<<
InstallScript: <<
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
@@ -835,7 +835,7 @@
SplitOff3: <<
Package: kexi
Description: KDE - integrated data management application
- Depends: %N-common (>= %v-%r), mysql14-shlibs, postgresql81-shlibs,
libpqxx2-shlibs
+ Depends: %N-common (>= %v-%r), mysql14-shlibs, postgresql82-shlibs,
libpqxx2-shlibs (>= 2.6.8-1)
Replaces: %N-common (<< %v-%r)
Files: <<
bin/kexi*
@@ -1239,8 +1239,8 @@
lib/kde3/krita*
lib/kde3/libkritapart.*
lib/libkdeinit_krita.*
- share/applnk/Office/krita*
share/applications/kde/krita*
+ share/applnk/.hidden/krita*
share/apps/konqueror/servicemenus/krita*
share/apps/krita
share/apps/kritaplugins
Modified: trunk/experimental/10.3/main/finkinfo/kde/koffice.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/kde/koffice.patch&rev=537&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/kde/koffice.patch (original)
+++ trunk/experimental/10.3/main/finkinfo/kde/koffice.patch Sun Dec 17 02:11:41
2006
@@ -1600,6 +1600,17 @@
typedef KisProgressSubject super;
/* Structs for the image rescaling routine */
+--- koffice-1.6.1/krita/core/kis_scale_visitor.h 2006-11-18
06:39:30.000000000 -0500
++++ koffice-1.6.1-new/krita/core/kis_scale_visitor.h 2006-12-10
15:37:12.000000000 -0500
+@@ -37,7 +37,7 @@
+ class KisProgressDisplayInterface;
+ class KisFilterStrategy;
+
+-class KisScaleWorker : public KisThread {
++class KRITACORE_EXPORT KisScaleWorker : public KisThread {
+
+ /* Structs for the image rescaling routine */
+ class Contrib {
--- koffice-1.6.1/krita/core/kis_strategy_move.cc.rej 2006-11-18
06:39:34.000000000 -0500
+++ koffice-1.6.1-new/krita/core/kis_strategy_move.cc.rej 1969-12-31
19:00:00.000000000 -0500
@@ -1,37 +0,0 @@
@@ -7663,3 +7674,15 @@
METASOURCES = AUTO
kde_module_LTLIBRARIES = krossruby.la
+--- koffice-1.6.1/kpresenter/KPrView.cpp 2006-11-17 10:13:01.000000000
-0500
++++ koffice-1.6.1-new/kpresenter/KPrView.cpp 2006-12-16 20:10:14.000000000
-0500
+@@ -206,7 +206,9 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/Xmd.h>
++extern "C" {
+ #include <X11/extensions/dpms.h>
++}
+ #include <fixx11h.h>
+
+ extern "C" {
Modified: trunk/experimental/10.4/main/finkinfo/kde/koffice.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/koffice.info&rev=537&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/koffice.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/koffice.info Sun Dec 17 02:11:41
2006
@@ -6,7 +6,7 @@
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: karbon (>= %v-%r), kchart (>= %v-%r), kexi (>= %v-%r), kformula (>=
%v-%r), kivio (>= %v-%r), kpresenter (>= %v-%r), krita (>= %v-%r), kspread (>=
%v-%r), kugar (>= %v-%r), kword (>= %v-%r), kplato (>= %v-%r)
-BuildDepends: arts-dev (>= 1.4.3-1021), aspell (>= 0.50.5-1002), aspell-dev
(>= 0.50.5-1002), audiofile, autoconf (>= 2.60-1), cctools-single-module,
esound, expat1, fink (>= 0.24-1), flex-devel, freetype219, libgettext3-dev,
gettext-tools, glib2 (>= 2.8.6-123), glib2-dev (>= 2.8.6-123), imagemagick (>=
6.1.8-1002), imagemagick-dev (>= 6.1.8-1002), kdelibs3-unified-dev (>=
3.4.3-1021), kjsembed-dev, lcms, libart2, libexif12, libgsf-dev, libiconv-dev,
libidn, libjpeg, libogg, libpaper1-dev, libpng3 (>= 1.2.5-4), libpqxx2-dev,
libtiff, libtool14, libvorbis0, libwpd-0.8-dev, libxml2 (>= 2.5.2-1), libxslt
(>= 1.0.27-1), libmad, macosx (>= 10.4.3-1), mysql14-dev (>= 4.1.10-1002),
openexr-dev (>= 1.2.2-31), pcre, pkgconfig, poppler-qt3, poppler1,
postgresql81-dev, python24 (>= 1:2.4.2-1004), qt3 (>= 3.3.6-1027), ruby18-dev,
sqlite3-dev, system-openssl-dev, wv2 (>= 0.2.2-1001), unsermake (>=
0.4-0.20060316.1), x11-dev
+BuildDepends: arts-dev (>= 1.4.3-1021), aspell (>= 0.50.5-1002), aspell-dev
(>= 0.50.5-1002), audiofile, autoconf (>= 2.60-1), cctools-single-module,
esound, expat1, fink (>= 0.24-1), flex-devel, freetype219, libgettext3-dev,
gettext-tools, glib2 (>= 2.8.6-123), glib2-dev (>= 2.8.6-123), imagemagick (>=
6.1.8-1002), imagemagick-dev (>= 6.1.8-1002), kdelibs3-unified-dev (>=
3.4.3-1021), kjsembed-dev, lcms, libart2, libexif12, libgsf-dev, libiconv-dev,
libidn, libjpeg, libogg, libpaper1-dev, libpng3 (>= 1.2.5-4), libpqxx2 (>=
2.6.8-1), libtiff, libtool14, libvorbis0, libwpd-0.8-dev, libxml2 (>= 2.5.2-1),
libxslt (>= 1.0.27-1), libmad, macosx (>= 10.4.3-1), mysql14-dev (>=
4.1.10-1002), openexr-dev (>= 1.2.2-31), pcre, pkgconfig, poppler-qt3,
poppler1, postgresql82-dev, python24 (>= 1:2.4.2-1004), qt3 (>= 3.3.6-1027),
ruby18-dev, sqlite3-dev, system-openssl-dev, wv2 (>= 0.2.2-1001), unsermake (>=
0.4-0.20060316.1), x11-dev
Replaces: %N-common (<< %v-%r), %N-dev (<< %v-%r)
GCC: 4.0
@@ -26,7 +26,7 @@
NoSetLDFLAGS: true
ConfigureParams: --enable-mysql --enable-pgsql
--with-pgsqlincdir=%p/include/postgresql --with-pgsqllibdir=%p/lib
--with-pqxx-includes=%p/include --with-pqxx-libraries=%p/lib
--with-distribution='Fink/Mac OS X'
CompileScript: <<
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
@@ -45,7 +45,7 @@
<<
InstallScript: <<
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
@@ -835,7 +835,7 @@
SplitOff3: <<
Package: kexi
Description: KDE - integrated data management application
- Depends: %N-common (>= %v-%r), mysql14-shlibs (>= 4.1.10-1002),
postgresql81-shlibs, libpqxx2-shlibs
+ Depends: %N-common (>= %v-%r), mysql14-shlibs (>= 4.1.10-1002),
postgresql82-shlibs, libpqxx2-shlibs (>= 2.6.8-1)
Replaces: %N-common (<< %v-%r)
Files: <<
bin/kexi*
@@ -1239,8 +1239,8 @@
lib/kde3/krita*
lib/kde3/libkritapart.*
lib/libkdeinit_krita.*
- share/applnk/Office/krita*
share/applications/kde/krita*
+ share/applnk/.hidden/krita*
share/apps/konqueror/servicemenus/krita*
share/apps/krita
share/apps/kritaplugins
Modified: trunk/experimental/10.4/main/finkinfo/kde/koffice.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/koffice.patch&rev=537&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/koffice.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/koffice.patch Sun Dec 17 02:11:41
2006
@@ -1600,6 +1600,17 @@
typedef KisProgressSubject super;
/* Structs for the image rescaling routine */
+--- koffice-1.6.1/krita/core/kis_scale_visitor.h 2006-11-18
06:39:30.000000000 -0500
++++ koffice-1.6.1-new/krita/core/kis_scale_visitor.h 2006-12-10
15:37:12.000000000 -0500
+@@ -37,7 +37,7 @@
+ class KisProgressDisplayInterface;
+ class KisFilterStrategy;
+
+-class KisScaleWorker : public KisThread {
++class KRITACORE_EXPORT KisScaleWorker : public KisThread {
+
+ /* Structs for the image rescaling routine */
+ class Contrib {
--- koffice-1.6.1/krita/core/kis_strategy_move.cc.rej 2006-11-18
06:39:34.000000000 -0500
+++ koffice-1.6.1-new/krita/core/kis_strategy_move.cc.rej 1969-12-31
19:00:00.000000000 -0500
@@ -1,37 +0,0 @@
@@ -7663,3 +7674,15 @@
METASOURCES = AUTO
kde_module_LTLIBRARIES = krossruby.la
+--- koffice-1.6.1/kpresenter/KPrView.cpp 2006-11-17 10:13:01.000000000
-0500
++++ koffice-1.6.1-new/kpresenter/KPrView.cpp 2006-12-16 20:10:14.000000000
-0500
+@@ -206,7 +206,9 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/Xmd.h>
++extern "C" {
+ #include <X11/extensions/dpms.h>
++}
+ #include <fixx11h.h>
+
+ extern "C" {
Modified: trunk/experimental/common/main/finkinfo/kde/koffice.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/koffice.info&rev=537&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/koffice.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/koffice.info Sun Dec 17
02:11:41 2006
@@ -36,7 +36,7 @@
libogg,
libpaper1-dev,
libpng3 (>= 1.2.5-4),
- libpqxx2-dev,
+ libpqxx2 (>= 2.6.8-1),
libtiff,
libtool14,
libvorbis0,
@@ -51,7 +51,7 @@
pkgconfig,
poppler-qt3,
poppler1,
- postgresql81-dev,
+ postgresql82-dev,
python24,
qt3 (>= 3.3.5-3),
ruby18-dev,
@@ -81,7 +81,7 @@
ConfigureParams: --enable-mysql --enable-pgsql
--with-pgsqlincdir=%p/include/postgresql --with-pgsqllibdir=%p/lib
--with-pqxx-includes=%p/include --with-pqxx-libraries=%p/lib
--with-distribution='Fink/Mac OS X'
CompileScript: <<
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
@@ -100,7 +100,7 @@
<<
InstallScript: <<
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
@@ -228,7 +228,7 @@
SplitOff3: <<
Package: kexi
Description: KDE - integrated data management application
- Depends: %N-common (>= %v-%r), mysql14-shlibs, postgresql81-shlibs,
libpqxx2-shlibs
+ Depends: %N-common (>= %v-%r), mysql14-shlibs, postgresql82-shlibs,
libpqxx2-shlibs (>= 2.6.8-1)
Replaces: %N-common (<< %v-%r)
Files: <<
bin/kexi*
@@ -412,8 +412,8 @@
lib/kde3/krita*
lib/kde3/libkritapart.*
lib/libkdeinit_krita.*
- share/applnk/Office/krita*
share/applications/kde/krita*
+ share/applnk/.hidden/krita*
share/apps/konqueror/servicemenus/krita*
share/apps/krita
share/apps/kritaplugins
Modified: trunk/experimental/common/main/finkinfo/kde/koffice.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/koffice.patch&rev=537&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/koffice.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/koffice.patch Sun Dec 17
02:11:41 2006
@@ -7818,3 +7818,15 @@
METASOURCES = AUTO
kde_module_LTLIBRARIES = krossruby.la
+--- koffice-1.6.1/kpresenter/KPrView.cpp 2006-11-17 10:13:01.000000000
-0500
++++ koffice-1.6.1-new/kpresenter/KPrView.cpp 2006-12-16 20:10:14.000000000
-0500
+@@ -206,7 +206,9 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/Xmd.h>
++extern "C" {
+ #include <X11/extensions/dpms.h>
++}
+ #include <fixx11h.h>
+
+ extern "C" {
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
