Changeset 520 for trunk


Ignore:
Timestamp:
Mar 16, 2016, 8:14:59 PM (5 years ago)
Author:
Matthias Waltenberger
Message:

Various build conf changes for GCC 4.9.2 (incl Steven's patch), #266 use shared library for poppler

Location:
trunk
Files:
1 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        22LocalConfig.kmk
        33LocalEnv.cmd
         4
         5.project
         6
         7.cproject
         8
         9.settings

  • trunk/Config.kmk

    r519 r520  
    4242# poppler
    4343#
    44 LIB_POPPLER_LIBS        =  $(patsubst %,$(PATH_STAGE_LIB)/%$(SUFF_LIB), \
    45         fofi goo poppler splash fontconfig freetype2 jpeg)
     44#LIB_POPPLER_LIBS       =  $(patsubst %,$(PATH_STAGE_LIB)/%$(SUFF_LIB), \
     45#       fofi goo poppler splash fontconfig freetype2 jpeg)
    4646
    4747#------------------------------------------------------------------------------
    … …  
    9595#
    9696
    97 TOOL_GXX3OMF_RC                                 ?= rc$(HOSTSUFF_EXE)
     97# 2016-03-10 SHL
     98override TOOL_GXX3OMF_RC                                        ?= rc$(HOSTSUFF_EXE)
    9899TOOL_GXX3OMF_RCOBJSUFF                  ?= .res
    99100
    … …  
    104105TOOL_GXX3OMF_COMPILE_RC_OUTPUT   =
    105106TOOL_GXX3OMF_COMPILE_RC_OUTPUT_MAYBE     =
    106 define TOOL_GXX3OMF_COMPILE_RC_CMDS
     107# 2016-03-05 SHL
     108override define TOOL_GXX3OMF_COMPILE_RC_CMDS
    107109        $(QUIET)cd $(subst /,\\,$(patsubst %/,%,$(dir $(source)))) && \
    108110                $(TOOL_GXX3OMF_RC) -n -r \
    … …  
    146148endef
    147149
    148 TOOL_GCC3OMF_RC                                 ?= $(TOOL_GXX3OMF_RC)
     150# 2016-03-10 SHL
     151override TOOL_GCC3OMF_RC                                        ?= $(TOOL_GXX3OMF_RC)
    149152TOOL_GCC3OMF_RCOBJSUFF                  ?= $(TOOL_GXX3OMF_RCOBJSUFF)
    150153
    … …  
    155158TOOL_GCC3OMF_COMPILE_RC_OUTPUT                   = $(TOOL_GXX3OMF_COMPILE_RC_OUTPUT)
    156159TOOL_GCC3OMF_COMPILE_RC_OUTPUT_MAYBE     = $(TOOL_GXX3OMF_COMPILE_RC_OUTPUT_MAYBE)
    157 TOOL_GCC3OMF_COMPILE_RC_CMDS                     = $(TOOL_GXX3OMF_COMPILE_RC_CMDS)
     160# 2016-03-10 SHL
     161override TOOL_GCC3OMF_COMPILE_RC_CMDS                    = $(TOOL_GXX3OMF_COMPILE_RC_CMDS)
    158162
    159163override define TOOL_GCC3OMF_LINK_DLL_CMDS
    … …  
    436440INSTALL := $(PATH_ROOT)/tools/install.cmd
    437441
     442

  • trunk/Lucide/changelog

    r517 r520  
     11.3.6:
     2  - updated build conf for GCC 4.9.2 / kBuild 0.1.9998 r2803
     3  - use poppler as system wide installed shared library (ticket #266)
     4
    151.3.5:
    26  - updated poppler to 0.20.3

  • trunk/Lucide/gui/Makefile.kmk

    r496 r520  
    5454        lcdfdlg.cpp                                                               \
    5555        Lucide.rc
    56 Lucide_dll_LIBPATH       = $(PATH_STAGE_LIB)
     56Lucide_dll_LIBPATH       = $(PATH_STAGE_LIB) \
     57        $(LIB_POPPLER_LIBS) \
     58        $(UNIXROOT)/usr/lib
    5759Lucide_dll_LIBS          = \
    58         ludoc.lib
     60        ludoc.lib \
     61        poppler_dll
    5962
    6063Lucide.rc_DEPS = dialogs.rc
    … …  
    7780include $(FILE_KBUILD_SUB_FOOTER)
    7881
     82

  • trunk/Lucide/plugins/lupoppler/Makefile.kmk

    r496 r520  
    1616lupoppler_NAME           = lupplr
    1717lupoppler_INCS           = \
    18         ../ludoc $(lupoppler_0_OUTDIR)/../ludoc                                   \
    19         ../../../poppler/mypoppler                                                \
    20         ../../../poppler/mypoppler/poppler                                        \
    21         ../../../poppler/fc-emulate-os2
     18        ../ludoc $(lupoppler_0_OUTDIR)/../ludoc \
     19        $(UNIXROOT)/usr/include \
     20        $(UNIXROOT)/usr/include/poppler \
     21        $(UNIXROOT)/usr/include/os2tk45
    2222lupoppler_SOURCES        = \
    2323        lupoppler.idl                                                             \
    … …  
    3535lupoppler_LIBS           = \
    3636        $(PATH_STAGE_LIB)/ludoc$(SUFF_LIB) \
    37         $(LIB_POPPLER_LIBS)
     37        $(LIB_POPPLER_LIBS) \
     38        poppler_dll
    3839
    3940include $(FILE_KBUILD_SUB_FOOTER)
    4041
     42

  • trunk/Lucide/plugins/lupoppler/lupibutton.cpp

    r492 r520  
    139139    LuPopplerInputButtonData *somThis = LuPopplerInputButtonGetData(somSelf);
    140140
    141     int count = somThis->widget->getNumSiblingsID();
     141    // int count = somThis->widget->getNumSiblingsID();
     142    int count = 0;
    142143
    143144    LuInputButton_SiblingSequence* siblings = (LuInputButton_SiblingSequence *)
    … …  
    147148    siblings->_buffer = (unsigned long *)SOMMalloc( sizeof( unsigned long * ) * count );
    148149
    149     unsigned *ids = somThis->widget->getSiblingsID();
     150    // unsigned *ids = somThis->widget->getSiblingsID();
     151    unsigned *ids = 0;
    150152    for ( int i = 0; i < count; ++i )
    151153        siblings->_buffer[ i ] = ids[ i ];

  • trunk/Lucide/plugins/lupoppler/lupifield.cpp

    r492 r520  
    148148}
    149149
    150 SOM_Scope boolean  SOMLINK isModified(LuPopplerInputField *somSelf,
    151                                        Environment *ev)
    152 {
    153     LuPopplerInputFieldData *somThis = LuPopplerInputFieldGetData(somSelf);
    154 
    155     return somThis->widget->isModified();
    156 }
    157 
    158150SOM_Scope boolean  SOMLINK isReadOnly(LuPopplerInputField *somSelf,
    159151                                       Environment *ev)

  • trunk/Lucide/plugins/lupoppler/lupifield.idl

    r367 r520  
    3131        getRectangle: override;
    3232        getID: override;
    33         isModified: override;
     33//       isModified: override;
    3434        isReadOnly: override;
    3535

  • trunk/Lucide/plugins/lupoppler/lupoppler.cpp

    r515 r520  
    5959#include <Link.h>
    6060#include <Form.h>
    61 #include <config.h>
    6261
    6362#include "lupoppler.xih"
    … …  
    107106{
    108107    strcpy(version, "PDF plugin, based on poppler library ");
    109     strcat(version, VERSION);
     108    strcat(version, POPPLER_VERSION);
    110109    return version;
    111110}
    … …  
    803802
    804803    PSOutputDev *out = new PSOutputDev( filename, doc, NULL,
    805                                 (first_page <= last_page) ? (first_page + 1) : (last_page + 1),
    806                                 (first_page <= last_page) ? (last_page + 1) : (first_page + 1),
     804                                { (first_page <= last_page) ? (first_page + 1) : (last_page + 1),
     805                                (first_page <= last_page) ? (last_page + 1) : (first_page + 1) },
    807806                                        psModePS, (int)width, (int)height, gFalse );
    808807

  • trunk/Lucide/readme

    r517 r520  
    3030  - gcc446.dll:
    3131    - ftp://ftp.netlabs.org/pub/gcc/gcc4core-1_2_1.wpi (WarpIn format)
     32  - poppler library needs to be installed to view PDFs:
     33    - "yum install poppler", can be installed from netlabs.org repository
    3234
    3335
    … …  
    7476$presentation      - will switch to presentation (even if minimized)
    7577$minimize          - will mimimize Lucide (even if fullscreen)
    76 $rotate            - will rotate 90ø CW
     78$rotate            - will rotate 90ï¿œ CW
    7779$zoomin            - will zoom in
    7880$zoomout           - will zoom out

  • trunk/Makefile.kmk

    r509 r520  
    99# Include sub-makefiles
    1010#
    11 include $(PATH_SUB_CURRENT)/poppler/Makefile.kmk
    1211include $(PATH_SUB_CURRENT)/libdjvu/Makefile.kmk
    1312include $(PATH_SUB_CURRENT)/libjpeg/Makefile.kmk
    … …  
    137136include $(FILE_KBUILD_SUB_FOOTER)
    138137
     138

  • trunk/libdjvu/GContainer.h

    r280 r520  
    963963      The new element is initialized with a copy of argument #elt#. */
    964964  void append(const TYPE &elt)
    965     { GListImpl<TI>::append(newnode((const TI&)elt)); }
     965    // 2016-03-10 SHL
     966    { GListImpl<TI>::append(this->newnode((const TI&)elt)); }
    966967  /** Inserts an element before the first element of the list.
    967968      The new element is initialized with a copy of argument #elt#. */
    … …  
    972973      list.  The new element is initialized with a copy of #elt#. */
    973974  void insert_after(GPosition pos, const TYPE &elt)
    974     { GListImpl<TI>::insert_after(pos, newnode((const TI&)elt)); }
     975    // 2016-03-10 SHL
     976    { GListImpl<TI>::insert_after(pos, this->newnode((const TI&)elt)); }
    975977  /** Inserts a new element before the list element at position #pos#. When
    976978      position #pos# is null the element is inserted at the end of the
    977979      list. The new element is initialized with a copy of #elt#. */
    978980  void insert_before(GPosition pos, const TYPE &elt)
    979     { GListImpl<TI>::insert_before(pos, newnode((const TI&)elt)); }
     981    // 2016-03-10 SHL
     982    { GListImpl<TI>::insert_before(pos, this->newnode((const TI&)elt)); }
    980983  /** Inserts an element of another list into this list.  This function
    981984      removes the element at position #frompos# in list #frompos#, inserts it
    … …  
    11981201GMapImpl<K,TI>::get_or_create(const K &key)
    11991202{
    1200   GCONT HNode *m = get(key);
     1203  // 2016-03-10 SHL
     1204  GCONT HNode *m = this->get(key);
    12011205  if (m) return m;
    12021206  MNode *n = (MNode*) operator new (sizeof(MNode));
    … …  
    12071211  new ((void*)&(n->val)) TI ();
    12081212  n->hashcode = hash((const K&)(n->key));
    1209   installnode(n);
     1213  // 2016-03-10 SHL
     1214  this->installnode(n);
    12101215  return n;
    12111216}
    … …  
    12731278      dealing with a #const GMAP<KTYPE,VTYPE>#. */
    12741279  const VTYPE& operator[](const KTYPE &key) const
    1275     { return (const VTYPE&)(((const typename GMapImpl<KTYPE,TI>::MNode*)(get_or_throw(key)))->val); }
     1280    // 2016-03-10 SHL
     1281    { return (const VTYPE&)(((const typename GMapImpl<KTYPE,TI>::MNode*)(this->get_or_throw(key)))->val); }
    12761282  /** Returns a reference to the value of the map entry for key #key#.  This
    12771283      reference can be used for both reading (as "#a[n]#") and modifying (as
    … …  
    12791285      for that key with the null constructor #VTYPE::VTYPE()#. */
    12801286  VTYPE& operator[](const KTYPE &key)
    1281     { return (VTYPE&)(((typename GMapImpl<KTYPE,TI>::MNode*)(get_or_create(key)))->val); }
     1287    // 2016-03-10 SHL
     1288    { return (VTYPE&)(((typename GMapImpl<KTYPE,TI>::MNode*)(this->get_or_create(key)))->val); }
    12821289  /** Destroys the map entry for position #pos#. 
    12831290      Nothing is done if position #pos# is not a valid position. */

  • trunk/libdjvu/GSmartPointer.h

    r280 r520  
    6666#endif
    6767
     68// 2016-03-10 SHL
     69#include <types.h>
     70
    6871/** @name GSmartPointer.h
    6972
Note: See TracChangeset for help on using the changeset viewer.