[SM-Commit] GIT changes to master grimoire by Robin Cook (c92dfbd561935a33bb848cfbd0eb732a13a563f7)

Robin Cook scm at sourcemage.org
Wed Sep 12 00:03:29 EDT 2007


GIT changes to master grimoire by Robin Cook <rcook at wyrms.net>:

 graphics-libs/poppler-data/BUILD                       |    1 
 graphics-libs/poppler-data/DETAILS                     |   13 +++
 graphics-libs/poppler-data/HISTORY                     |    2 
 graphics-libs/poppler-data/LICENSE                     |   41 +++++++++++
 graphics-libs/poppler-data/Makefile.diff               |   11 +++
 graphics-libs/poppler-data/PRE_BUILD                   |    4 +
 graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig |binary
 graphics-libs/poppler/DEPENDS                          |   59 +++++++++--------
 graphics-libs/poppler/DETAILS                          |    5 -
 graphics-libs/poppler/HISTORY                          |    5 +
 graphics-libs/poppler/configure.ac.diff                |   11 ---
 graphics-libs/poppler/poppler-0.6.tar.gz.sig           |binary
 12 files changed, 113 insertions(+), 39 deletions(-)

New commits:
commit c92dfbd561935a33bb848cfbd0eb732a13a563f7
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    poppler: updated to 0.6

commit 0ad46b29f1470e19715c4ef6d346ebaef8578a0c
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    poppler-data: new spell

diff --git a/graphics-libs/poppler-data/BUILD b/graphics-libs/poppler-data/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/graphics-libs/poppler-data/BUILD
@@ -0,0 +1 @@
+true
diff --git a/graphics-libs/poppler-data/DETAILS b/graphics-libs/poppler-data/DETAILS
new file mode 100755
index 0000000..6cd371d
--- /dev/null
+++ b/graphics-libs/poppler-data/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=poppler-data
+         VERSION=0.1
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://poppler.freedesktop.org/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      LICENSE[0]=LICENSE
+        WEB_SITE=http://poppler.freedesktop.org/
+         ENTERED=20070911
+           SHORT="poppler encoding data"
+cat << EOF
+poppler encoding data
+EOF
diff --git a/graphics-libs/poppler-data/HISTORY b/graphics-libs/poppler-data/HISTORY
new file mode 100644
index 0000000..7457460
--- /dev/null
+++ b/graphics-libs/poppler-data/HISTORY
@@ -0,0 +1,2 @@
+2007-09-12 Robin Cook <rcook at wyrms.net>
+	* Initial Spell: DETAILS, PRE_BUILD, BUILD, HISTORY
diff --git a/graphics-libs/poppler-data/LICENSE b/graphics-libs/poppler-data/LICENSE
new file mode 100644
index 0000000..70acb91
--- /dev/null
+++ b/graphics-libs/poppler-data/LICENSE
@@ -0,0 +1,41 @@
+The various data files installed by the poppler-data package carries
+this license:
+
+    Copyright 1990-1998 Adobe Systems Incorporated.
+    All Rights Reserved.
+    
+    Patents Pending
+    
+    NOTICE: All information contained herein is the property of Adobe
+    Systems Incorporated.
+    
+    Permission is granted for redistribution of this file provided
+    this copyright notice is maintained intact and that the contents
+    of this file are not altered in any way from its original form.
+    
+    PostScript and Display PostScript are trademarks of Adobe Systems
+    Incorporated which may be registered in certain jurisdictions.
+
+The Makefile is licensed under the MIT license:
+
+    Copyright © 2006 Red Hat, Inc
+    
+    Permission to use, copy, modify, distribute, and sell this
+    software and its documentation for any purpose is hereby granted
+    without fee, provided that the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation, and that the name of
+    Red Hat, Inc not be used in advertising or publicity pertaining to
+    distribution of the software without specific, written prior
+    permission.  Red Hat, Inc makes no representations about the
+    suitability of this software for any purpose.  It is provided "as
+    is" without express or implied warranty.
+    
+    RED HAT, INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL RED HAT, INC BE LIABLE FOR ANY SPECIAL,
+    INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+    RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+    OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
diff --git a/graphics-libs/poppler-data/Makefile.diff b/graphics-libs/poppler-data/Makefile.diff
new file mode 100644
index 0000000..09d7055
--- /dev/null
+++ b/graphics-libs/poppler-data/Makefile.diff
@@ -0,0 +1,11 @@
+--- Makefile.orig	2007-09-11 22:25:18.000000000 -0500
++++ Makefile	2007-09-11 22:25:30.000000000 -0500
+@@ -1,7 +1,7 @@
+ PACKAGE    = poppler-data
+ VERSION    = 0.1
+ distdir    = $(PACKAGE)-$(VERSION)
+-prefix     = /usr/local
++prefix     = /usr
+ datadir    = $(prefix)/share
+ pkgdatadir = $(datadir)/poppler
+ 
diff --git a/graphics-libs/poppler-data/PRE_BUILD b/graphics-libs/poppler-data/PRE_BUILD
new file mode 100755
index 0000000..a1dcf21
--- /dev/null
+++ b/graphics-libs/poppler-data/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build       &&
+cd ${SOURCE_DIRECTORY}  &&
+
+patch -p0 < ${SCRIPT_DIRECTORY}/Makefile.diff
diff --git a/graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig b/graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig
new file mode 100644
index 0000000..c36d1c3
Binary files /dev/null and b/graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig differ
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 2725d7c..9aa6000 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -2,30 +2,39 @@ if  [  "$POPPLER_CVS"  ==  "y"  ];  then
   depends  CVS
 fi  &&
 
-depends  g++         &&
-depends  fontconfig  &&
+depends  g++           &&
+depends  fontconfig    &&
+depends  poppler-data  &&
 
-optional_depends  zlib              \
-                  "--enable-zlib"   \
-                  "--disable-zlib"  \
+optional_depends  zlib                           \
+                  "--enable-zlib"                \
+                  "--disable-zlib"               \
                   "for compressed file support"  &&
-optional_depends  jpeg                 \
-                  "--enable-libjpeg"   \
-                  "--disable-libjpeg"  \
-                  "for jpeg support"   &&
-optional_depends  gtk+2                     \
-                  "--enable-poppler-glib"   \
-                  "--disable-poppler-glib"  \
-                  "for glib wrapper"        &&
-optional_depends  qt4                       \
-                  "--enable-poppler-qt4"    \
-                  "--disable-poppler-qt4"   \
-                  "for QT wrapper"          &&
-optional_depends  qt-x11                    \
-                  "--enable-poppler-qt"     \
-                  "--disable-poppler-qt"    \
-                  "for QT wrapper"          &&
-optional_depends  cairo                     \
-                  "--enable-cairo-output"   \
-                  "--disable-cairo-output"  \
-                  "for cairo output"
+optional_depends  jpeg                           \
+                  "--enable-libjpeg"             \
+                  "--disable-libjpeg"            \
+                  "for jpeg support"             &&
+optional_depends  gtk+2                          \
+                  "--enable-poppler-glib"        \
+                  "--disable-poppler-glib"       \
+                  "for glib wrapper"             &&
+optional_depends  qt4                            \
+                  "--enable-poppler-qt4"         \
+                  "--disable-poppler-qt4"        \
+                  "for QT wrapper"               &&
+optional_depends  qt-x11                         \
+                  "--enable-poppler-qt"          \
+                  "--disable-poppler-qt"         \
+                  "for QT wrapper"               &&
+optional_depends  cairo                          \
+                  "--enable-cairo-output"        \
+                  "--disable-cairo-output"       \
+                  "for cairo output"             &&
+optional_depends  abiwork                        \
+                  "--enable-abiword-output"      \
+                  "--disable-abiword-output"     \
+                  "generate gtk-docs"            &&
+optional_depends  gtk-doc                        \
+                  "--enable-gtk-doc"             \
+                  "--disable-gtk-doc"            \
+                  "generate gtk-docs"
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 3fe38e6..00e3a54 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -11,12 +11,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
    SOURCE_URL[0]=cvs://:pserver:anoncvs@cvs.freedesktop.org:/cvs/poppler:poppler
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.5.91
-     SOURCE_HASH=sha512:6e149714687889e28bbef5b22ddb7ca89c925219d87776293d66e7f5a51ed99198b8b6f675b4c97da5623dcfa39709093c422541dc4642e2c31668ff72ad11ae
+         VERSION=0.6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://poppler.freedesktop.org/$SOURCE
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 fi
         WEB_SITE=http://poppler.freedesktop.org/
       LICENSE[0]=GPL
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index b415f32..b6b9cc7 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,8 @@
+2007-09-11 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated VERSION to 0.6
+	* DEPENDS: added poppler-data
+	  added optionals on abiword and gtk-doc
+
 2007-09-12 Pol Vinogradov <vin.public at gmail.com>
 	* DETAILS: fixed VERSION fields for CVS branch
 
diff --git a/graphics-libs/poppler/configure.ac.diff b/graphics-libs/poppler/configure.ac.diff
deleted file mode 100644
index b64fd3d..0000000
--- a/graphics-libs/poppler/configure.ac.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2006-10-12 19:44:43.000000000 -0500
-+++ configure.ac	2006-10-12 19:45:40.000000000 -0500
-@@ -183,7 +183,7 @@
-               enable_poppler_glib=$enableval,
-               enable_poppler_glib="try")
- if test x$enable_poppler_glib = xyes; then
--  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib >= 2.6)
-+  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6)
- elif test x$enable_poppler_glib = xtry; then
-   PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0,
-                     [enable_poppler_glib="yes"],
diff --git a/graphics-libs/poppler/poppler-0.6.tar.gz.sig b/graphics-libs/poppler/poppler-0.6.tar.gz.sig
new file mode 100644
index 0000000..dcd56ea
Binary files /dev/null and b/graphics-libs/poppler/poppler-0.6.tar.gz.sig differ



More information about the SM-Commit mailing list