[CVS] OpenPKG: openpkg-src/djvulibre/ djvulibre.patch djvulibre.spec

2009-05-24 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  r...@openpkg.org
  Module: openpkg-src  Date:   24-May-2009 11:30:26
  Branch: HEAD Handle: 2009052410302600

  Modified files:
openpkg-src/djvulibre   djvulibre.patch djvulibre.spec

  Log:
upgrading package: djvulibre 3.5.21 -> 3.5.22

  Summary:
RevisionChanges Path
1.3 +1  -159openpkg-src/djvulibre/djvulibre.patch
1.4 +2  -2  openpkg-src/djvulibre/djvulibre.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/djvulibre/djvulibre.patch
  
  $ cvs diff -u -r1.2 -r1.3 djvulibre.patch
  --- openpkg-src/djvulibre/djvulibre.patch 9 May 2009 07:45:08 -   
1.2
  +++ openpkg-src/djvulibre/djvulibre.patch 24 May 2009 09:30:26 -  
1.3
  @@ -1,72 +1,6 @@
  -Index: gui/nsdejavu/nsdejavu.c
   gui/nsdejavu/nsdejavu.c.orig 2007-04-23 15:01:27 +0200
  -+++ gui/nsdejavu/nsdejavu.c  2009-05-09 09:37:18 +0200
  -@@ -2054,9 +2054,9 @@
  - }
  -   if (new_window)
  - {
  --  NPSetWindowCallbackStruct *cbs 
  --= (NPSetWindowCallbackStruct *) win_str->ws_info;
  --  Display * displ=cbs->display;
  -+  Display *displ = 0;
  -+  if (NPN_GetValue(np_inst, NPNVxDisplay, &displ) != NPERR_NO_ERROR)
  -+displ = ((NPSetWindowCallbackStruct *)(win_str->ws_info))->display;
  -   if (!IsConnectionOK(FALSE)) 
  - return NPERR_GENERIC_ERROR;
  -   if (Attach(displ, new_window, id) < 0)
  -Index: libdjvu/DjVuDocEditor.cpp
   libdjvu/DjVuDocEditor.cpp.orig   2008-08-05 22:50:35 +0200
  -+++ libdjvu/DjVuDocEditor.cpp2009-05-09 09:37:18 +0200
  -@@ -134,11 +134,6 @@
  - 
  - DjVuDocEditor::~DjVuDocEditor(void)
  - {
  --   if (!tmp_doc_url.is_empty())
  --   {
  -- tmp_doc_url.deletefile();
  --   }
  --
  -GCriticalSectionLock lock(&thumb_lock);
  -thumb_map.empty();
  -DataPool::close_all();
  -@@ -192,18 +187,15 @@
  -orig_doc_type==OLD_INDEXED ||
  -orig_doc_type==SINGLE_PAGE)
  -{
  -- // Suxx. I need to convert it NOW.
  -- // We will unlink this file in the destructor
  --  tmp_doc_url=GURL::Filename::Native(tmpnam(0));
  --  const GP gstr(ByteStream::create(tmp_doc_url, "wb"));
  --  tmp_doc->write(gstr, true);// Force DJVM format
  --  gstr->flush();
  --  doc_pool=DataPool::create(tmp_doc_url);
  -+ // Suxx. I need to convert it now.
  -+ GP gstr = ByteStream::create();  // Convert in memory.
  -+ tmp_doc->write(gstr, true);  // Force DJVM format
  -+ gstr->seek(0); 
  -+ doc_pool=DataPool::create(gstr);
  -}
  - 
  -   // OK. Now doc_pool contains data of the document in one of the
  -   // new formats. It will be a lot easier to insert/delete pages now.
  --
  -   // 'doc_url' below of course doesn't refer to the file with the 
converted
  -   // data, but we will take care of it by redirecting the 
request_data().
  -initialized=true;
  -Index: libdjvu/DjVuDocEditor.h
   libdjvu/DjVuDocEditor.h.orig 2007-05-19 05:07:33 +0200
  -+++ libdjvu/DjVuDocEditor.h  2009-05-09 09:37:18 +0200
  -@@ -403,7 +403,6 @@
  -bool initialized;
  -GURL doc_url;
  -GP doc_pool;
  --   GURL tmp_doc_url;
  -int  orig_doc_type;
  -int  orig_doc_pages;
  - 
   Index: libdjvu/atomic.cpp
   --- libdjvu/atomic.cpp.orig  2008-08-03 05:54:01 +0200
  -+++ libdjvu/atomic.cpp   2009-05-09 09:37:18 +0200
   libdjvu/atomic.cpp   2009-05-24 11:27:28 +0200
   @@ -280,7 +280,7 @@
// PART3 - THE IMPLEMENTATION
*/
  @@ -76,95 +10,3 @@

/* We have fast synchronization */

  -Index: libdjvu/ddjvuapi.pc.in
   libdjvu/ddjvuapi.pc.in.orig  2005-12-04 02:36:26 +0100
  -+++ libdjvu/ddjvuapi.pc.in   2009-05-09 09:37:18 +0200
  -@@ -8,5 +8,6 @@
  - Version: @PACKAGE_VERSION@
  - Requires:
  - Conflicts:
  --Libs: -L${libdir} -ldjvulibre @JPEG_LIBS@ @PTHREAD_LIBS@ @LIBS@
  -+Libs: -L${libdir} -ldjvulibre 
  -+Libs.private: @JPEG_LIBS@ @PTHREAD_LIBS@ @LIBS@
  - Cflags: -I${includedir} @JPEG_CFLAGS@ @PTHREAD_CFLAGS@
  -Index: tools/Makefile.in
   tools/Makefile.in.orig   2008-07-03 00:43:53 +0200
  -+++ tools/Makefile.in2009-05-09 09:37:18 +0200
  -@@ -53,8 +53,8 @@
  - 
  - INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir}
  - FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} 
${THREAD_CFLAGS}
  --LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
  --MORELIBS= @LDFL

[CVS] OpenPKG: openpkg-src/djvulibre/ djvulibre.patch djvulibre.spec

2009-05-09 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  r...@openpkg.org
  Module: openpkg-src  Date:   09-May-2009 09:45:10
  Branch: HEAD Handle: 2009050908450800

  Modified files:
openpkg-src/djvulibre   djvulibre.patch djvulibre.spec

  Log:
apply a bunch of Debian patches

  Summary:
RevisionChanges Path
1.2 +159 -1 openpkg-src/djvulibre/djvulibre.patch
1.3 +1  -1  openpkg-src/djvulibre/djvulibre.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/djvulibre/djvulibre.patch
  
  $ cvs diff -u -r1.1 -r1.2 djvulibre.patch
  --- openpkg-src/djvulibre/djvulibre.patch 19 Dec 2008 19:44:54 -  
1.1
  +++ openpkg-src/djvulibre/djvulibre.patch 9 May 2009 07:45:08 -   
1.2
  @@ -1,6 +1,72 @@
  +Index: gui/nsdejavu/nsdejavu.c
  +--- gui/nsdejavu/nsdejavu.c.orig 2007-04-23 15:01:27 +0200
   gui/nsdejavu/nsdejavu.c  2009-05-09 09:37:18 +0200
  +@@ -2054,9 +2054,9 @@
  + }
  +   if (new_window)
  + {
  +-  NPSetWindowCallbackStruct *cbs 
  +-= (NPSetWindowCallbackStruct *) win_str->ws_info;
  +-  Display * displ=cbs->display;
  ++  Display *displ = 0;
  ++  if (NPN_GetValue(np_inst, NPNVxDisplay, &displ) != NPERR_NO_ERROR)
  ++displ = ((NPSetWindowCallbackStruct *)(win_str->ws_info))->display;
  +   if (!IsConnectionOK(FALSE)) 
  + return NPERR_GENERIC_ERROR;
  +   if (Attach(displ, new_window, id) < 0)
  +Index: libdjvu/DjVuDocEditor.cpp
  +--- libdjvu/DjVuDocEditor.cpp.orig   2008-08-05 22:50:35 +0200
   libdjvu/DjVuDocEditor.cpp2009-05-09 09:37:18 +0200
  +@@ -134,11 +134,6 @@
  + 
  + DjVuDocEditor::~DjVuDocEditor(void)
  + {
  +-   if (!tmp_doc_url.is_empty())
  +-   {
  +- tmp_doc_url.deletefile();
  +-   }
  +-
  +GCriticalSectionLock lock(&thumb_lock);
  +thumb_map.empty();
  +DataPool::close_all();
  +@@ -192,18 +187,15 @@
  +orig_doc_type==OLD_INDEXED ||
  +orig_doc_type==SINGLE_PAGE)
  +{
  +- // Suxx. I need to convert it NOW.
  +- // We will unlink this file in the destructor
  +-  tmp_doc_url=GURL::Filename::Native(tmpnam(0));
  +-  const GP gstr(ByteStream::create(tmp_doc_url, "wb"));
  +-  tmp_doc->write(gstr, true);// Force DJVM format
  +-  gstr->flush();
  +-  doc_pool=DataPool::create(tmp_doc_url);
  ++ // Suxx. I need to convert it now.
  ++ GP gstr = ByteStream::create();  // Convert in memory.
  ++ tmp_doc->write(gstr, true);  // Force DJVM format
  ++ gstr->seek(0); 
  ++ doc_pool=DataPool::create(gstr);
  +}
  + 
  +   // OK. Now doc_pool contains data of the document in one of the
  +   // new formats. It will be a lot easier to insert/delete pages now.
  +-
  +   // 'doc_url' below of course doesn't refer to the file with the 
converted
  +   // data, but we will take care of it by redirecting the 
request_data().
  +initialized=true;
  +Index: libdjvu/DjVuDocEditor.h
  +--- libdjvu/DjVuDocEditor.h.orig 2007-05-19 05:07:33 +0200
   libdjvu/DjVuDocEditor.h  2009-05-09 09:37:18 +0200
  +@@ -403,7 +403,6 @@
  +bool initialized;
  +GURL doc_url;
  +GP doc_pool;
  +-   GURL tmp_doc_url;
  +int  orig_doc_type;
  +int  orig_doc_pages;
  + 
   Index: libdjvu/atomic.cpp
   --- libdjvu/atomic.cpp.orig  2008-08-03 05:54:01 +0200
  -+++ libdjvu/atomic.cpp   2008-12-19 20:24:20 +0100
   libdjvu/atomic.cpp   2009-05-09 09:37:18 +0200
   @@ -280,7 +280,7 @@
// PART3 - THE IMPLEMENTATION
*/
  @@ -10,3 +76,95 @@

/* We have fast synchronization */

  +Index: libdjvu/ddjvuapi.pc.in
  +--- libdjvu/ddjvuapi.pc.in.orig  2005-12-04 02:36:26 +0100
   libdjvu/ddjvuapi.pc.in   2009-05-09 09:37:18 +0200
  +@@ -8,5 +8,6 @@
  + Version: @PACKAGE_VERSION@
  + Requires:
  + Conflicts:
  +-Libs: -L${libdir} -ldjvulibre @JPEG_LIBS@ @PTHREAD_LIBS@ @LIBS@
  ++Libs: -L${libdir} -ldjvulibre 
  ++Libs.private: @JPEG_LIBS@ @PTHREAD_LIBS@ @LIBS@
  + Cflags: -I${includedir} @JPEG_CFLAGS@ @PTHREAD_CFLAGS@
  +Index: tools/Makefile.in
  +--- tools/Makefile.in.orig   2008-07-03 00:43:53 +0200
   tools/Makefile.in2009-05-09 09:37:18 +0200
  +@@ -53,8 +53,8 @@
  + 
  + INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir}
  + FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} 
${THREAD_CFLAGS}
  +-LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
  +-MORELIBS= @LDFLAGS@ ${JPEG_LI

[CVS] OpenPKG: openpkg-src/djvulibre/ djvulibre.patch djvulibre.spec

2008-12-19 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  r...@openpkg.org
  Module: openpkg-src  Date:   19-Dec-2008 20:44:54
  Branch: HEAD Handle: 2008121919445400

  Added files:
openpkg-src/djvulibre   djvulibre.patch djvulibre.spec

  Log:
new package: djvulibre 3.5.21 (DjVu Library)

  Summary:
RevisionChanges Path
1.1 +12 -0  openpkg-src/djvulibre/djvulibre.patch
1.1 +110 -0 openpkg-src/djvulibre/djvulibre.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/djvulibre/djvulibre.patch
  
  $ cvs diff -u -r0 -r1.1 djvulibre.patch
  --- /dev/null 2008-12-19 20:44:45 +0100
  +++ djvulibre.patch   2008-12-19 20:44:54 +0100
  @@ -0,0 +1,12 @@
  +Index: libdjvu/atomic.cpp
  +--- libdjvu/atomic.cpp.orig  2008-08-03 05:54:01 +0200
   libdjvu/atomic.cpp   2008-12-19 20:24:20 +0100
  +@@ -280,7 +280,7 @@
  + // PART3 - THE IMPLEMENTATION
  + */
  + 
  +-#if HAVE_SYNC
  ++#if 0
  + 
  + /* We have fast synchronization */
  + 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/djvulibre/djvulibre.spec
  
  $ cvs diff -u -r0 -r1.1 djvulibre.spec
  --- /dev/null 2008-12-19 20:44:45 +0100
  +++ djvulibre.spec2008-12-19 20:44:54 +0100
  @@ -0,0 +1,110 @@
  +##
  +##  djvulibre.spec -- OpenPKG RPM Package Specification
  +##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. 
  +##
  +##  Permission to use, copy, modify, and distribute this software for
  +##  any purpose with or without fee is hereby granted, provided that
  +##  the above copyright notice and this permission notice appear in all
  +##  copies.
  +##
  +##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  +##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  +##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  +##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
  +##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  +##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  +##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  +##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  +##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  +##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  +##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  +##  SUCH DAMAGE.
  +##
  +
  +#   package information
  +Name: djvulibre
  +Summary:  DjVu Library
  +URL:  http://djvu.sourceforge.net/
  +Vendor:   Leon Bottou & Yann Le Cun et al.
  +Packager: OpenPKG Foundation e.V.
  +Distribution: OpenPKG Community
  +Class:EVAL
  +Group:Postscript
  +License:  GPL
  +Version:  3.5.21
  +Release:  20081219
  +
  +#   list of sources
  +Source0:  
http://switch.dl.sourceforge.net/djvu/djvulibre-%{version}.tar.gz
  +Patch0:   djvulibre.patch
  +
  +#   build information
  +Prefix:   %{l_prefix}
  +BuildRoot:%{l_buildroot}
  +BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, gcc::with_cxx = yes, make
  +PreReq:   OpenPKG, openpkg >= 20060823
  +BuildPreReq:  libiconv, jpeg, tiff, zlib
  +PreReq:   libiconv, jpeg, tiff, zlib
  +AutoReq:  no
  +AutoReqProv:  no
  +
  +%description
  +DjVu is a set of compression technologies, a file format, and
  +a software platform for the delivery over the Web of digital
  +documents, scanned documents, and high resolution images. DjVu
  +documents download and display extremely quickly, and look exactly
  +the same on all platforms. DjVu can be seen as superior alternative
  +to PDF and Postscript for digital documents, to TIFF (and PDF) for
  +scanned documents, to JPEG for photographs and pictures, and to
  +GIF for large palettized images. DjVu is the only Web format that
  +is practical for distributing high-resolution scanned documents in
  +color. No other format comes close.
  +
  +%track
  +prog djvulibre = {
  +version   = %{version}
  +url   = http://djvu.sourceforge.net/index.html
  +regex = djvulibre-(__VER__)\.tar\.gz
  +}
  +
  +%prep
  +%setup -q
  +%patch -p0
  +
  +%build
  +CC="%{l_cc}" \
  +CXX="%{l_cxx}" \
  +CFLAGS="%{l_cflags -O}" \
  +CXXFLAGS="%{l_cxxflags -O}" \
  +CPPFLAGS="%{l_cppflags tiff .}" \
  +LDFLAGS="%{l_ldflags}" \
  +LIBS="-ltiff -ljpeg -lz" \
  +./configure \
  +