rpms/compat-wxGTK/devel wxGTK-2.4.2-ft2fix.patch, NONE, 1.1 compat-wxGTK.spec, 1.3, 1.4

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17114/devel

Modified Files:
	compat-wxGTK.spec 
Added Files:
	wxGTK-2.4.2-ft2fix.patch 
Log Message:

Fix bugzilla 188370


wxGTK-2.4.2-ft2fix.patch:

--- NEW FILE wxGTK-2.4.2-ft2fix.patch ---
--- wxGTK-2.4.2/src/generic/dcpsg.cpp.BAD	2006-08-22 13:17:37.000000000 -0500
+++ wxGTK-2.4.2/src/generic/dcpsg.cpp	2006-08-22 13:18:22.000000000 -0500
@@ -1146,7 +1146,7 @@
   FILE *file;
 };
 
-static int paps_move_to( FT_Vector* to,
+static int paps_move_to( const FT_Vector* to,
 			 void *user_data)
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
@@ -1156,7 +1156,7 @@
   return 0;
 }
 
-static int paps_line_to( FT_Vector*  to,
+static int paps_line_to( const FT_Vector*  to,
 			 void *user_data)
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
@@ -1166,8 +1166,8 @@
   return 0;
 }
 
-static int paps_conic_to( FT_Vector*  control,
-			  FT_Vector*  to,
+static int paps_conic_to( const FT_Vector*  control,
+			  const FT_Vector*  to,
 			  void *user_data)
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
@@ -1179,9 +1179,9 @@
   return 0;
 }
 
-static int paps_cubic_to( FT_Vector*  control1,
-			  FT_Vector*  control2,
-			  FT_Vector*  to,
+static int paps_cubic_to( const FT_Vector*  control1,
+			  const FT_Vector*  control2,
+			  const FT_Vector*  to,
 			  void *user_data)
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;


Index: compat-wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/devel/compat-wxGTK.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- compat-wxGTK.spec	18 Mar 2006 16:08:02 -0000	1.3
+++ compat-wxGTK.spec	22 Aug 2006 19:42:18 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           compat-wxGTK
 Version:        2.4.2
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Compatibility version of the wxWidgets GTK GUI library
 License:        BSD
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@
 Patch0:         wxGTK-2.4.2-privates.patch
 Patch1:         wxGTK-2.4.2-aclocal18.patch
 Patch2:         wxGTK-2.4.2-gcc4.patch
+Patch3:         wxGTK-2.4.2-ft2fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel gtk2-devel zlib-devel >= 1.1.4
@@ -149,6 +150,7 @@
 %patch0 -p1 -b .privates
 %patch1 -p0 -b .aclocal18
 %patch2 -p1 -b .gcc4
+%patch3 -p1 -b .ft2fix
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -217,7 +219,14 @@
 mv $RPM_BUILD_ROOT%{_datadir}/aclocal/wxwin.m4 \
    $RPM_BUILD_ROOT%{_datadir}/aclocal/wxwin-2.4.m4
 
-%find_lang wxstd
+# We have to rename the .mo files. This will probably break the
+# translations, but anyone so motivated to use them can rename them back.
+for i in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/wxstd.mo; do
+	NEWNAME=`echo $i | sed -e "s/wxstd.mo/compat-wxstd.mo/"`;
+	mv $i $NEWNAME;
+done
+
+%find_lang compat-wxstd
 
 
 %clean
@@ -277,7 +286,7 @@
 %{_libdir}/libwx_gtk2[-_]*.so
 %{_libdir}/wx/include/gtk2-2*
 
-%files common -f wxstd.lang
+%files common -f compat-wxstd.lang
 %defattr(-,root,root,-)
 %doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
 %{_datadir}/wx/
@@ -317,6 +326,10 @@
 
 
 %changelog
+* Tue Aug 22 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-18
+- hack around conflicting locales (BZ 188370)
+- fix ft2 issue (maybe gcc4 issue) where headers don't match function call
+
 * Sat Mar 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-17
 - fix include blob in files (bz 175500)
 - remove all "Provides" (bz 175500)