Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6BF3A74ED for ; Sun, 27 Nov 2011 05:05:50 +0000 (UTC) Received: (qmail 53402 invoked by uid 500); 27 Nov 2011 05:05:50 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 53337 invoked by uid 500); 27 Nov 2011 05:05:47 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 53326 invoked by uid 99); 27 Nov 2011 05:05:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Nov 2011 05:05:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Nov 2011 05:05:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2DE9623888EA; Sun, 27 Nov 2011 05:05:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1206665 - in /incubator/ooo/trunk/main: ./ agg/ canvas/prj/ canvas/source/tools/ readlicense_oo/html/ scp2/source/canvas/ solenv/config/ Date: Sun, 27 Nov 2011 05:05:21 -0000 To: ooo-commits@incubator.apache.org From: pfg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111127050522.2DE9623888EA@eris.apache.org> Author: pfg Date: Sun Nov 27 05:05:18 2011 New Revision: 1206665 URL: http://svn.apache.org/viewvc?rev=1206665&view=rev Log: Remove the Anti-Grain Geometry agg module: the OpenGL canvas rendering code was never really completed. Removed: incubator/ooo/trunk/main/agg/ incubator/ooo/trunk/main/canvas/source/tools/bitmap.cxx incubator/ooo/trunk/main/canvas/source/tools/image.cxx incubator/ooo/trunk/main/canvas/source/tools/image.hxx incubator/ooo/trunk/main/canvas/source/tools/image_sysprereq.h incubator/ooo/trunk/main/canvas/source/tools/imagecachedprimitive.hxx Modified: incubator/ooo/trunk/main/NOTICE incubator/ooo/trunk/main/canvas/prj/build.lst incubator/ooo/trunk/main/canvas/source/tools/canvastools.flt incubator/ooo/trunk/main/canvas/source/tools/makefile.mk incubator/ooo/trunk/main/configure.in incubator/ooo/trunk/main/readlicense_oo/html/THIRDPARTYLICENSEREADME.html incubator/ooo/trunk/main/scp2/source/canvas/canvascommons.scp incubator/ooo/trunk/main/scp2/source/canvas/makefile.mk incubator/ooo/trunk/main/set_soenv.in incubator/ooo/trunk/main/solenv/config/sooo340.ini incubator/ooo/trunk/main/solenv/config/ssolar.cmn Modified: incubator/ooo/trunk/main/NOTICE URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/NOTICE?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/NOTICE (original) +++ incubator/ooo/trunk/main/NOTICE Sun Nov 27 05:05:18 2011 @@ -63,11 +63,6 @@ Library copyrighted by WiseGuys Internet license. More information is available here: http://software.wise-guys.nl/libtextcat/ -The optional "agg" module contains code by Maxim Shemanarev as -part of the Anti-Grain Geometry Project. More information on -AGG is available here: - http://www.antigrain.com/ - We use the Tango base icon theme under Public Domain by the Tango Desktop Project. More information is available here: http://tango.freedesktop.org/ Modified: incubator/ooo/trunk/main/canvas/prj/build.lst URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/canvas/prj/build.lst?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/canvas/prj/build.lst (original) +++ incubator/ooo/trunk/main/canvas/prj/build.lst Sun Nov 27 05:05:18 2011 @@ -1,4 +1,4 @@ -cv canvas : javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl AGG:agg basegfx CAIRO:cairo LIBXSLT:libxslt NULL +cv canvas : javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL cv canvas usr1 - all cv_mkout NULL cv canvas\inc nmake - all cv_inc NULL cv canvas\source\tools nmake - all cv_tools cv_inc NULL Modified: incubator/ooo/trunk/main/canvas/source/tools/canvastools.flt URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/canvas/source/tools/canvastools.flt?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/canvas/source/tools/canvastools.flt (original) +++ incubator/ooo/trunk/main/canvas/source/tools/canvastools.flt Sun Nov 27 05:05:18 2011 @@ -1,4 +1,3 @@ __CT __real -internal -agg \ No newline at end of file +internal \ No newline at end of file Modified: incubator/ooo/trunk/main/canvas/source/tools/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/canvas/source/tools/makefile.mk?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/canvas/source/tools/makefile.mk (original) +++ incubator/ooo/trunk/main/canvas/source/tools/makefile.mk Sun Nov 27 05:05:18 2011 @@ -68,17 +68,7 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1IMPLIB= i$(TARGET) SHL1STDLIBS= $(SALLIB) $(CPPULIB) $(BASEGFXLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(VCLLIB) $(TKLIB) $(TOOLSLIB) -.IF "$(ENABLE_AGG)"=="YES" - SLOFILES += $(SLO)$/bitmap.obj \ - $(SLO)$/image.obj - - .IF "$(AGG_VERSION)"!="" - CDEFS += -DAGG_VERSION=$(AGG_VERSION) - .ENDIF - SHL1STDLIBS += $(AGGLIB) -.ENDIF - -SHL1LIBS= $(SLB)$/$(TARGET).lib +SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME =$(SHL1TARGET) Modified: incubator/ooo/trunk/main/configure.in URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/configure.in (original) +++ incubator/ooo/trunk/main/configure.in Sun Nov 27 05:05:18 2011 @@ -29,9 +29,6 @@ AC_ARG_WITH(dmake-url, AC_ARG_WITH(gnu-patch, [ --with-gnu-patch Specify location of GNU patch on Solaris or FreeBSD ],,) -AC_ARG_ENABLE(agg, -[ --enable-agg Use internal agg -],,) AC_ARG_WITH(gnu-cp, [ --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD ],,) @@ -549,9 +546,6 @@ AC_ARG_ENABLE(Xaw, AC_ARG_WITH(system-neon, [ --with-system-neon Use neon already on system ],,) -AC_ARG_WITH(system-agg, -[ --with-system-agg Use AGG already on system -],,) AC_ARG_ENABLE(hunspell, [ --enable-hunspell Determines whether to enable the Hunspell library. If enabled, the library will be built unless you @@ -5122,58 +5116,6 @@ AC_SUBST(OPENSSL_CFLAGS) AC_SUBST(OPENSSL_LIBS) dnl =================================================================== -dnl Test for enabling agg -dnl =================================================================== -AC_MSG_CHECKING([whether to enable agg]) -if test "$enable_agg" = "yes"; then - AC_MSG_RESULT([yes]) - AC_SUBST(ENABLE_AGG) - ENABLE_AGG=YES - AGG_VERSION=2400 -else - AC_MSG_RESULT([no]) - ENABLE_AGG=NO - - dnl =================================================================== - dnl Check for system AGG - dnl =================================================================== - AC_MSG_CHECKING([which AGG to use]) - if test -n "$with_system_agg" -o -n "$with_system_libs" && \ - test "$with_system_agg" != "no"; then - AC_MSG_RESULT([external]) - PKG_CHECK_MODULES(AGG, libagg >= 2.3) - AC_MSG_CHECKING([agg version]) - # workaround; if AGG_CFLAGS is empty (broken libagg.pc in 2.3), add /usr/include/agg2 anyway - # (/usr/include gets stripped from pkg-config output) - if test -z "$AGG_CFLAGS" || test "$AGG_CFLAGS" = " "; then - AGG_INCDIR="`$PKG_CONFIG --variable includedir libagg`/agg2" - else - AGG_INCDIR="`echo $AGG_CFLAGS | $SED -e s/-I//`" - fi - if $PKG_CONFIG --modversion libagg | grep -q 2.3 || \ - $PKG_CONFIG --modversion libagg | grep -q 2.4; then - # 2.4's libagg.pc.in still contains 2.3 :/ - if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then - AC_MSG_RESULT([2.4]) - AGG_VERSION=2400 - else - AC_MSG_RESULT([2.3]) - AGG_VERSION=2300 - fi - SYSTEM_AGG=YES - else - AC_MSG_ERROR([only agg 2.3 and 2.4 are supported]) - fi - else - AC_MSG_RESULT([internal]) - SYSTEM_AGG=NO - BUILD_TYPE="$BUILD_TYPE AGG" - fi - AC_SUBST(SYSTEM_AGG) - AC_SUBST(AGG_VERSION) -fi - -dnl =================================================================== dnl Check for system redland dnl =================================================================== AC_MSG_CHECKING([which redland library to use]) Modified: incubator/ooo/trunk/main/readlicense_oo/html/THIRDPARTYLICENSEREADME.html URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/readlicense_oo/html/THIRDPARTYLICENSEREADME.html?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/readlicense_oo/html/THIRDPARTYLICENSEREADME.html (original) +++ incubator/ooo/trunk/main/readlicense_oo/html/THIRDPARTYLICENSEREADME.html Sun Nov 27 05:05:18 2011 @@ -1307,34 +1307,6 @@ by the terms of the license below:
The following software may be -included in this product: Antigrain; Use of any of this -software -is governed -by the terms of the license below:
-

Axim Shemanarev
-

-

Antigrain
-

- -
-Anti-Grain Geometry - Version 2.0 -
-Copyright (C) 2002-2004 Maxim Shemanarev (McSeem) -
- -Permission to copy, use, modify, sell and distribute this software -is granted provided this copyright notice appears in all copies. -This software is provided "as is" without express or implied -warranty, and with no claim as to its suitability for any purpose. -
- - - - - - - -
The following software may be included in this product: beanshell; Use of any of this software is governed Modified: incubator/ooo/trunk/main/scp2/source/canvas/canvascommons.scp URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/canvas/canvascommons.scp?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/scp2/source/canvas/canvascommons.scp (original) +++ incubator/ooo/trunk/main/scp2/source/canvas/canvascommons.scp Sun Nov 27 05:05:18 2011 @@ -30,11 +30,5 @@ STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas) STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools) -#ifdef ENABLE_AGG -#ifndef SYSTEM_AGG -STD_LIB_FILE(gid_File_Lib_Agg, agg) -#endif -#endif - SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno) SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno) Modified: incubator/ooo/trunk/main/scp2/source/canvas/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/canvas/makefile.mk?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/scp2/source/canvas/makefile.mk (original) +++ incubator/ooo/trunk/main/scp2/source/canvas/makefile.mk Sun Nov 27 05:05:18 2011 @@ -39,13 +39,6 @@ TARGETTYPE=CUI SCP_PRODUCT_TYPE=osl -.IF "$(ENABLE_AGG)" == "YES" -SCPDEFS+=-DENABLE_AGG -.IF "$(SYSTEM_AGG)" == "YES" -SCPDEFS+=-DSYSTEM_AGG -.ENDIF -.ENDIF - PARFILES= canvascommons.par \ vclcanvas.par Modified: incubator/ooo/trunk/main/set_soenv.in URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/set_soenv.in (original) +++ incubator/ooo/trunk/main/set_soenv.in Sun Nov 27 05:05:18 2011 @@ -1972,9 +1972,6 @@ ToFile( "NEON_VERSION", "@NEON_VERS ToFile( "NEON_LIBS", "@NEON_LIBS@", "e" ); ToFile( "NEON_CFLAGS", "@NEON_CFLAGS@", "e" ); ToFile( "DISABLE_XAW", "@DISABLE_XAW@", "e" ); -ToFile( "ENABLE_AGG", "@ENABLE_AGG@", "e" ); -ToFile( "SYSTEM_AGG", "@SYSTEM_AGG@", "e" ); -ToFile( "AGG_VERSION", "@AGG_VERSION@", "e" ); ToFile( "DMAKE_URL", "@DMAKE_URL@", "e" ); ToFile( "DMAKE_PATH", "@DMAKE_PATH@", "e" ); ToFile( "IS_SYSTEM_DMAKE", "@IS_SYSTEM_DMAKE@", "e" ); Modified: incubator/ooo/trunk/main/solenv/config/sooo340.ini URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/config/sooo340.ini?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/solenv/config/sooo340.ini (original) +++ incubator/ooo/trunk/main/solenv/config/sooo340.ini Sun Nov 27 05:05:18 2011 @@ -9,11 +9,10 @@ common BMP_WRITES_FLAG TRUE BUILD_SPECIAL TRUE BUILD_STAX YES - BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS CAIRO + BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS CAIRO CONFIG_PROJECT config_office DIC_ALL TRUE ENABLEUNICODE TRUE - ENABLE_AGG NO ENABLE_CUPS TRUE ENABLE_DIRECTX TRUE ENABLE_FONTCONFIG TRUE Modified: incubator/ooo/trunk/main/solenv/config/ssolar.cmn URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/config/ssolar.cmn?rev=1206665&r1=1206664&r2=1206665&view=diff ============================================================================== --- incubator/ooo/trunk/main/solenv/config/ssolar.cmn (original) +++ incubator/ooo/trunk/main/solenv/config/ssolar.cmn Sun Nov 27 05:05:18 2011 @@ -80,7 +80,6 @@ common DRIVE_O DRIVE_S DYNAMIC_CRT - ENABLE_AGG ENABLE_CRASHDUMP ENABLE_CUPS ENABLE_DIRECTX @@ -265,7 +264,6 @@ common XSLTPROC ZIPDEP ZIPSOURCE - AGG_VERSION ANT_HOME ANT_LIB ANT