rpms/scribus/EL-6 scribus-1.3.7-system-hyphen.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 scribus.spec, 1.55, 1.56 sources, 1.23, 1.24 scribus-1.3.5-system-hyphen.patch, 1.1, NONE scribus-1.3.6-linker.patch, 1.1, NONE scribus-1.3.6-podofo-0.8.0.patch, 1.1, NONE scribus-1.3.6-qstring.patch, 1.1, NONE scribus-1.3.6-version.patch, 1.1, NONE

Fri Jun 4 09:58:21 UTC 2010

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29092

Modified Files:
	.cvsignore scribus.spec sources 
Added Files:
	scribus-1.3.7-system-hyphen.patch 
Removed Files:
	scribus-1.3.5-system-hyphen.patch scribus-1.3.6-linker.patch 
	scribus-1.3.6-podofo-0.8.0.patch scribus-1.3.6-qstring.patch 
	scribus-1.3.6-version.patch 
Log Message:
* Tue Jun  1 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-1
- update to final 1.3.7


scribus-1.3.7-system-hyphen.patch:
 CMakeLists.txt                 |   10 ++++++++++
 cmake/modules/FindHYPHEN.cmake |   28 ++++++++++++++++++++++++++++
 scribus/CMakeLists.txt         |   16 ++++++++++++++--
 scribus/hyphenator.h           |    3 +--
 4 files changed, 53 insertions(+), 4 deletions(-)

--- NEW FILE scribus-1.3.7-system-hyphen.patch ---
>From 714923566c62dbe89991ca8e100d9c47e9aa38fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Tue, 1 Jun 2010 10:54:50 +0200
Subject: [PATCH] use system hyphen library

---
 Scribus/CMakeLists.txt                 |   10 ++++++++++
 Scribus/cmake/modules/FindHYPHEN.cmake |   28 ++++++++++++++++++++++++++++
 Scribus/scribus/CMakeLists.txt         |   16 ++++++++++++++--
 Scribus/scribus/hyphenator.h           |    2 +-
 4 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 Scribus/cmake/modules/FindHYPHEN.cmake

diff --git a/Scribus/CMakeLists.txt b/Scribus/CMakeLists.txt
index 482fb4c..2547d3b 100644
--- a/Scribus/CMakeLists.txt
+++ b/Scribus/CMakeLists.txt
@@ -684,6 +684,16 @@ IF (WITH_PODOFO)
 ENDIF (WITH_PODOFO)
 #>>PoDoFo for AI PDF import
 
+#<<HYPHEN for system hyphenation library
+FIND_PACKAGE(HYPHEN)
+IF(HYPHEN_FOUND)
+  MESSAGE("system hyphenation library found OK")
+  SET(HAVE_HYPHEN 1)
+ELSE(HYPHEN_FOUND)
+  MESSAGE("system hyphenation library NOT found - will use internal one")
+ENDIF(HYPHEN_FOUND)
+#>>HYPHEN for system hyphenation library
+
 ##############################################################################################################
 ########## Include Setup                                                                            ##########
 
diff --git a/Scribus/cmake/modules/FindHYPHEN.cmake b/Scribus/cmake/modules/FindHYPHEN.cmake
new file mode 100644
index 0000000..d67bd59
--- /dev/null
+++ b/Scribus/cmake/modules/FindHYPHEN.cmake
@@ -0,0 +1,28 @@
+# - Find HYPHEN library
+# Find the native HYPHEN includes and library
+# This module defines
+#  HYPHEN_INCLUDE_DIR, where to find hyphen.h, etc.
+#  HYPHEN_LIBRARIES, libraries to link against to use HYPHEN.
+#  HYPHEN_FOUND, If false, do not try to use HYPHEN.
+# also defined, but not for general use are
+#  HYPHEN_LIBRARY, where to find the HYPHEN library.
+
+FIND_PATH(HYPHEN_INCLUDE_DIR hyphen.h)
+
+SET(HYPHEN_NAMES_RELEASE ${HYPHEN_NAMES_RELEASE} ${HYPHEN_NAMES} hyphen libhyphen)
+SET(HYPHEN_NAMES_DEBUG ${HYPHEN_NAMES_DEBUG} hyphend libhyphend)
+
+FIND_LIBRARY(HYPHEN_LIBRARY_RELEASE NAMES ${HYPHEN_NAMES_RELEASE} )
+FIND_LIBRARY(HYPHEN_LIBRARY_DEBUG NAMES ${HYPHEN_NAMES_DEBUG} )
+
+INCLUDE(LibraryDebugAndRelease)
+SET_LIBRARY_FROM_DEBUG_AND_RELEASE(HYPHEN)
+
+# handle the QUIETLY and REQUIRED arguments and set HYPHEN_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(ScribusFindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(HYPHEN DEFAULT_MSG HYPHEN_LIBRARY HYPHEN_INCLUDE_DIR)
+
+IF(HYPHEN_FOUND)
+  SET( HYPHEN_LIBRARIES ${HYPHEN_LIBRARY} )
+ENDIF(HYPHEN_FOUND)
diff --git a/Scribus/scribus/CMakeLists.txt b/Scribus/scribus/CMakeLists.txt
index e856781..49da5f6 100644
--- a/Scribus/scribus/CMakeLists.txt
+++ b/Scribus/scribus/CMakeLists.txt
@@ -396,10 +396,8 @@ SET(SCRIBUS_SOURCES
   guidesdelegate.cpp
   guidesmodel.cpp
   helpbrowser.cpp
-  hnjalloc.c
   hruler.cpp
   hyask.cpp
-  hyphen.c
   hyphenator.cpp
   hysettings.cpp
   imageinfodialog.cpp
@@ -634,6 +632,14 @@ SET(SCRIBUS_SOURCES
   vruler.cpp
 )
 
+IF(NOT HAVE_HYPHEN)
+  SET(SCRIBUS_SOURCES
+    ${SCRIBUS_SOURCES}
+    hnjalloc.c
+    hyphen.c
+  )
+ENDIF(NOT HAVE_HYPHEN)
+
 IF(WIN32)
   SET(SCRIBUS_MOC_WIN32_ONLY_CLASSES scprintengine_gdi.h)
   SET(SCRIBUS_WIN32_ONLY_SOURCES
@@ -783,6 +789,12 @@ IF(HAVE_PODOFO)
   )
 ENDIF(HAVE_PODOFO)
 
+IF(HAVE_HYPHEN)
+  TARGET_LINK_LIBRARIES(${EXE_NAME}
+    ${HYPHEN_LIBRARY}
+  )
+ENDIF(HAVE_HYPHEN)
+
 # Now build plugins
 SET(PLUGIN_LIBRARIES)
 IF(WIN32)
diff --git a/Scribus/scribus/hyphenator.h b/Scribus/scribus/hyphenator.h
index 7712c37..1312950 100644
--- a/Scribus/scribus/hyphenator.h
+++ b/Scribus/scribus/hyphenator.h
@@ -13,7 +13,7 @@ for which a new license (GPL+exception) is in place.
 #include <QSet>
 
 #include "scribusapi.h"
-#include "hyphen.h"
+#include <hyphen.h>
 class ScribusDoc;
 class ScribusMainWindow;
 class PageItem;
-- 
1.6.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/EL-6/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	31 Mar 2010 10:43:04 -0000	1.23
+++ .cvsignore	4 Jun 2010 09:58:20 -0000	1.24
@@ -1 +1 @@
-scribus-1.3.6.tar.bz2
+scribus-1.3.7.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/EL-6/scribus.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- scribus.spec	11 May 2010 09:51:04 -0000	1.55
+++ scribus.spec	4 Jun 2010 09:58:21 -0000	1.56
@@ -1,6 +1,6 @@
 Name:           scribus
-Version:        1.3.6
-Release:        4%{?dist}
+Version:        1.3.7
+Release:        1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -10,15 +10,7 @@ URL:            http://www.scribus.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 # https://bugzilla.redhat.com/show_bug.cgi?id=506074
 # http://bugs.scribus.net/view.php?id=8232
-Patch0:         %{name}-1.3.5-system-hyphen.patch
-# fix version variable for buildsystem
-Patch1:         %{name}-1.3.6-version.patch
-# fix QString initialization in Qt 4.7
-Patch2:         %{name}-1.3.6-qstring.patch
-# fix linking with --no-add-needed
-Patch3:         %{name}-1.3.6-linker.patch
-# fix build with podofo 0.8.0
-Patch4:         %{name}-1.3.6-podofo-0.8.0.patch
+Patch0:         %{name}-1.3.7-system-hyphen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -85,11 +77,7 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .system-hyphen
-%patch1 -p1 -b .version
-%patch2 -p1 -b .qstring
-%patch3 -p1 -b .linker
-%patch4 -p2 -b .podofo
+%patch0 -p2 -b .system-hyphen
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -197,6 +185,9 @@ update-mime-database %{_datadir}/mime > 
 
 
 %changelog
+* Tue Jun  1 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-1
+- update to final 1.3.7
+
 * Thu Apr 29 2010 Dan Horák <dan[AT]danny.cz> - 1.3.6-4
 - fix build with podofo 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/EL-6/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	31 Mar 2010 10:43:04 -0000	1.23
+++ sources	4 Jun 2010 09:58:21 -0000	1.24
@@ -1 +1 @@
-2d653c8371d198b5d8321e9ba5e0142d  scribus-1.3.6.tar.bz2
+2c486389172c053ff4da38960e412690  scribus-1.3.7.tar.bz2


--- scribus-1.3.5-system-hyphen.patch DELETED ---


--- scribus-1.3.6-linker.patch DELETED ---


--- scribus-1.3.6-podofo-0.8.0.patch DELETED ---


--- scribus-1.3.6-qstring.patch DELETED ---


--- scribus-1.3.6-version.patch DELETED ---

