RHEL/Fedora: more application fixes ...

3 files changed, 50 insertions, 47 deletions

diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch
index d632a9d79..909107727 100644
--- a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch
+++ b/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch
@@ -17,40 +17,3 @@
          }
      
          ~Iterator()
---- koffice/filters/chalk/png/kis_png_converter.cc.gcc47	2012-04-26 16:38:35.805156927 -0400
-+++ koffice/filters/chalk/png/kis_png_converter.cc	2012-04-26 16:49:27.179323394 -0400
-@@ -43,6 +43,8 @@
- #include <kis_paint_layer.h>
- #include <kis_group_layer.h>
- 
-+#include <zlib.h>
-+
- namespace {
- 
-     const TQ_UINT8 PIXEL_BLUE = 0;
-@@ -222,6 +224,7 @@
-     
-     // Read image profile
-     png_charp profile_name, profile_data;
-+    unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data);
-     int compression_type;
-     png_uint_32 proflen;
-     int number_of_passes = 1;
-@@ -230,7 +233,7 @@
-         number_of_passes = png_set_interlace_handling(png_ptr);
- 
-     KisProfile* profile = 0;
--    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen))
-+    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen))
-     {
-         TQByteArray profile_rawdata;
-         // XXX: Hardcoded for icc type -- is that correct for us?
-@@ -627,7 +630,7 @@
-         } else { // Profile
-             char* name = new char[(*it)->type().length()+1];
-             strcpy(name, (*it)->type().ascii());
--            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size());
-+            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size());
-         }
-         ++it;
-     }
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch b/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch
index cba4b2584..004bb0225 100644
--- a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch
+++ b/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch
@@ -1,5 +1,5 @@
---- /dev/shm/applications/koffice/filters/chalk/png/kis_png_converter.cc	2011-06-27 13:54:18.000000000 -0500
-+++ /dev/shm/applications/koffice/filters/chalk/png/kis_png_converter.cc.new	2011-11-07 15:38:47.918508855 -0600
+--- koffice/filters/chalk/png/kis_png_converter.cc	2011-06-27 13:54:18.000000000 -0500
++++ koffice/filters/chalk/png/kis_png_converter.cc.new	2011-11-07 15:38:47.918508855 -0600
 @@ -785,7 +785,7 @@
  
  void KisPNGConverter::progress(png_structp png_ptr, png_uint_32 row_number, int pass)
@@ -9,3 +9,40 @@
  //     setProgress(row_number);
  }
  
+--- koffice/filters/chalk/png/kis_png_converter.cc.gcc47	2012-04-26 16:38:35.805156927 -0400
++++ koffice/filters/chalk/png/kis_png_converter.cc	2012-04-26 16:49:27.179323394 -0400
+@@ -43,6 +43,8 @@
+ #include <kis_paint_layer.h>
+ #include <kis_group_layer.h>
+ 
++#include <zlib.h>
++
+ namespace {
+ 
+     const TQ_UINT8 PIXEL_BLUE = 0;
+@@ -222,6 +224,7 @@
+     
+     // Read image profile
+     png_charp profile_name, profile_data;
++    unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data);
+     int compression_type;
+     png_uint_32 proflen;
+     int number_of_passes = 1;
+@@ -230,7 +233,7 @@
+         number_of_passes = png_set_interlace_handling(png_ptr);
+ 
+     KisProfile* profile = 0;
+-    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen))
++    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen))
+     {
+         TQByteArray profile_rawdata;
+         // XXX: Hardcoded for icc type -- is that correct for us?
+@@ -627,7 +630,7 @@
+         } else { // Profile
+             char* name = new char[(*it)->type().length()+1];
+             strcpy(name, (*it)->type().ascii());
+-            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size());
++            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size());
+         }
+         ++it;
+     }
diff --git a/redhat/applications/koffice/trinity-koffice.spec b/redhat/applications/koffice/trinity-koffice.spec
index 9f487c4e6..fe3f44328 100644
--- a/redhat/applications/koffice/trinity-koffice.spec
+++ b/redhat/applications/koffice/trinity-koffice.spec
@@ -92,9 +92,6 @@ BuildRequires:  gettext-devel
 BuildRequires:  mysql-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  perl
-BuildRequires:  trinity-wv2-devel >= 0.4.0
-#BuildRequires:  trinity-libpqxx-devel >= 2.6.0
-BuildRequires:  libpqxx-devel
 BuildRequires:  doxygen
 BuildRequires:  aspell-devel
 BuildRequires:  libxslt-devel
@@ -108,10 +105,12 @@ BuildRequires:  ruby ruby-devel >= 1.8.2
 BuildRequires:  libpaper-devel
 BuildRequires:  libXi-devel
 BuildRequires:	libutempter-devel
-BuildRequires:	poppler-qt-devel >= 0.1.2
 BuildRequires:	GraphicsMagick-devel >= 1.1.0
-BuildRequires:	trinity-libwpd-devel
 
+BuildRequires:  trinity-wv2-devel
+BuildRequires:	trinity-poppler-qt3-devel >= 0.1.2
+BuildRequires:	trinity-libwpd-devel
+BuildRequires:  trinity-libpqxx-devel
 
 %description
 KOffice is an integrated office suite.
@@ -308,8 +307,10 @@ This package is part of the TDE Office Suite.
 %patch10 -p0
 %patch11 -p0
 %patch12 -p1 -b .gcc47
-%patch13 -p1
-%patch14 -p5
+%if 0%{?fedora} >= 17
+%patch13 -p1 -b .ruby
+%patch14 -p1 -b .libpng
+%endif
 
 # use LGC variant instead
 %__sed -i.dejavu-lgc \
@@ -324,7 +325,7 @@ This package is part of the TDE Office Suite.
   -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -343,6 +344,8 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
   --with-extra-includes=%{_includedir}/tqt \
   --enable-closure \
   --disable-kexi-macros \
+  --with-pqxx-includes=%{_includedir} \
+  --with-pqxx-libraries=%{_libdir} \
 %if 0%{?with_kross} > 0
   --enable-scripting \
 %else