incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1201711 - in /incubator/ooo/trunk/main: configure.in filter/prj/build.lst ooo.lst sdext/prj/build.lst sdext/source/pdfimport/xpdfwrapper/makefile.mk xpdf/
Date Mon, 14 Nov 2011 14:03:32 GMT
Author: jsc
Date: Mon Nov 14 14:03:32 2011
New Revision: 1201711

URL: http://svn.apache.org/viewvc?rev=1201711&view=rev
Log:
118592, remove incompatible xpdf, applied patch, thanks to Andre Fischer (af)

Removed:
    incubator/ooo/trunk/main/xpdf/
Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/filter/prj/build.lst
    incubator/ooo/trunk/main/ooo.lst
    incubator/ooo/trunk/main/sdext/prj/build.lst
    incubator/ooo/trunk/main/sdext/source/pdfimport/xpdfwrapper/makefile.mk

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1201711&r1=1201710&r2=1201711&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Mon Nov 14 14:03:32 2011
@@ -419,7 +419,7 @@ AC_ARG_ENABLE(presenter-console,
 [  --enable-presenter-console          enables the build of the Presenter Console extension
 ],,)
 AC_ARG_ENABLE(pdfimport,
-[  --enable-pdfimport          enables the build of the PDF Import extension and xpdf
+[  --enable-pdfimport          enables the build of the PDF Import extension
 ],,)
 AC_ARG_ENABLE(wiki-publisher,
 [  --enable-wiki-publisher      enables the build of the Wiki Publisher extension
@@ -5950,22 +5950,16 @@ if test -n "$enable_pdfimport" -a "$enab
   dnl ===================================================================
   dnl Check for system poppler
   dnl ===================================================================
-  AC_MSG_CHECKING([which pdf backend to use])
+  AC_MSG_CHECKING([whether to use system pdf backend])
   if test -n "$with_system_poppler" -o -n "$with_system_libs" && \
        test "$with_system_poppler" != "no"; then
       AC_MSG_RESULT([external])
       SYSTEM_POPPLER=YES
       PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
   else
-      AC_MSG_RESULT([internal])
+      AC_MSG_RESULT([no])
       SYSTEM_POPPLER=NO
-      BUILD_TYPE="$BUILD_TYPE XPDF"
-      AC_MSG_CHECKING([for xpdf module])
-      if test -d ./xpdf; then
-       AC_MSG_RESULT([OK])
-      else
-        AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
-      fi
+      ENABLE_PDFIMPORT=NO
   fi
 else
    AC_MSG_RESULT([no])

Modified: incubator/ooo/trunk/main/filter/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/prj/build.lst?rev=1201711&r1=1201710&r2=1201711&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/prj/build.lst (original)
+++ incubator/ooo/trunk/main/filter/prj/build.lst Mon Nov 14 14:03:32 2011
@@ -1,4 +1,4 @@
-fl      filter  :    L10N:l10n svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper
XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx NULL
+fl      filter  :    L10N:l10n svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper
jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx NULL
 fl	filter									usr1	-	all	fl_mkout			NULL
 fl	filter\prj								get		-	all	fl_prj				NULL
 fl	filter\inc								nmake	-	all	fl_inc				NULL

Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1201711&r1=1201710&r2=1201711&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Mon Nov 14 14:03:32 2011
@@ -25,7 +25,6 @@ ca4870d899fd7e943ffc310a5421ad4d-liberat
 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
 4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
-599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
 b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.tar.gz
 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz

Modified: incubator/ooo/trunk/main/sdext/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sdext/prj/build.lst?rev=1201711&r1=1201710&r2=1201711&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/prj/build.lst (original)
+++ incubator/ooo/trunk/main/sdext/prj/build.lst Mon Nov 14 14:03:32 2011
@@ -1,4 +1,4 @@
-dx	sdext	:	L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper
officecfg XPDF:xpdf LIBXSLT:libxslt xmlhelp NULL
+dx	sdext	:	L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper
officecfg LIBXSLT:libxslt xmlhelp NULL
 dx	sdext									usr1	-	all	sdext_mkout NULL
 dx	sdext\prj								get		-	all	sdext_prj NULL
 dx	sdext\source\minimizer					nmake	-	all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo
sdext_inc NULL

Modified: incubator/ooo/trunk/main/sdext/source/pdfimport/xpdfwrapper/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sdext/source/pdfimport/xpdfwrapper/makefile.mk?rev=1201711&r1=1201710&r2=1201711&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/source/pdfimport/xpdfwrapper/makefile.mk (original)
+++ incubator/ooo/trunk/main/sdext/source/pdfimport/xpdfwrapper/makefile.mk Mon Nov 14 14:03:32
2011
@@ -41,16 +41,12 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 CFLAGS+=-DSYSTEM_ZLIB
 .ENDIF
 
-.IF "$(ENABLE_PDFIMPORT)" == "NO"
+.IF "$(ENABLE_PDFIMPORT)" == "NO" || "$(SYSTEM_POPPLER)" != "YES"
 @all:
 	@echo "PDF Import extension disabled."
 .ENDIF
 
-.IF "$(SYSTEM_POPPLER)" == "YES"
 CFLAGS += $(POPPLER_CFLAGS) -DSYSTEM_POPPLER
-.ELSE
-CFLAGS += -I$(SOLARINCDIR)$/xpdf
-.ENDIF
 
 # --- Files --------------------------------------------------------
 UWINAPILIB:=
@@ -61,22 +57,8 @@ APP1OBJS= \
 
 APP1STDLIBS+=$(ZLIB3RDLIB)
 
-.IF "$(SYSTEM_POPPLER)" == "YES"
 APP1STDLIBS+=$(POPPLER_LIBS)
-.ELSE
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-APP1STDLIBS+=-lxpdf -lfofi -lGoo -lgdi32 -ladvapi32
-.ELSE
-APP1STDLIBS+=xpdf.lib fofi.lib Goo.lib gdi32.lib advapi32.lib
-.ENDIF
-.ELSE
-.IF "$(OS)" == "MACOSX" && "$(GUIBASE)"=="unx"
-APP1STDLIBS+=-lobjc
-.ENDIF
-APP1STDLIBS+=-lxpdf -lfofi -lGoo
-.ENDIF
-.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk



Mime
View raw message