[Libreoffice-commits] .: 5 commits - config_host.mk.in configure.in formula/source i18npool/CustomTarget_breakiterator.mk icu/makefile.mk icu/prj jpeg/jpeg-6b.patch jpeg/makefile.mk scp2/source svtools/inc svtools/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Sun May 13 01:51:14 PDT 2012
config_host.mk.in | 1
configure.in | 29 --------
formula/source/ui/dlg/ControlHelper.hxx | 2
formula/source/ui/dlg/funcpage.cxx | 4 -
formula/source/ui/dlg/funcpage.hxx | 2
formula/source/ui/dlg/funcutl.cxx | 23 ------
i18npool/CustomTarget_breakiterator.mk | 16 ----
icu/makefile.mk | 5 +
icu/prj/d.lst | 1
jpeg/jpeg-6b.patch | 113 --------------------------------
jpeg/makefile.mk | 3
scp2/source/ooo/makefile.mk | 4 -
svtools/inc/svtools/ctrlbox.hxx | 1
svtools/source/control/ctrlbox.cxx | 7 -
unusedcode.easy | 7 -
15 files changed, 5 insertions(+), 213 deletions(-)
New commits:
commit 2068144fdcfdee3abe2a90b3b4b3bd49589618f2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun May 13 09:47:52 2012 +0100
ensure freshly built icu headers are newer than previous headers
Change-Id: I Icf78937810e1d8ac646805d9f523a4149f45acb5
diff --git a/icu/makefile.mk b/icu/makefile.mk
index ce54ff5..38bbcdd 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -278,6 +278,10 @@ OUT2BIN= \
.ENDIF
.ENDIF # "$(GUI)"=="WNT"
+#make sure that when we deliver the headers of a new icu that the timestamps
+#are newer than the last icu to ensure dependencies are correctly rebuilt
+INSTALL_ACTION=find . -name "*.h" -print0 | xargs -0 touch
+
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
@@ -324,4 +328,3 @@ $(LB)$/icutu$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
# Changes in this makefile could also make a complete build necessary if
# configure is affected.
$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : makefile.mk
-
diff --git a/icu/prj/d.lst b/icu/prj/d.lst
index 91000be..c76b3ff 100644
--- a/icu/prj/d.lst
+++ b/icu/prj/d.lst
@@ -1,5 +1,4 @@
mkdir: %_DEST%\inc\icu
-mkdir: %_DEST%\inc\external\icu
mkdir: %_DEST%\inc\external\layout
mkdir: %_DEST%\inc\external\unicode
..\%__SRC%\misc\build\icu\source\layout\*.h %_DEST%\inc\external\layout\*.h
commit 46f10590837f566284470cff8ac95b122e12b147
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat May 12 11:22:15 2012 +0100
java berkleydb usage is history
Change-Id: I9c99507e225cc32a8079d10df6e1ce52f69552a4
diff --git a/configure.in b/configure.in
index 4dd184c..ddf47e8 100644
--- a/configure.in
+++ b/configure.in
@@ -1077,8 +1077,7 @@ AC_ARG_WITH(system-headers,
AC_ARG_WITH(system-jars,
AS_HELP_STRING([--without-system-jars],
[When building with --with-system-libs, also the needed jars are expected
- on the system. Use this to disable that (except for the db case where
- --with-system-db *has to* imply using the db.jar from there, too).]),,
+ on the system. Use this to disable that]),,
[with_system_jars="$with_system_libs"])
AC_ARG_WITH(system-stdlibs,
commit 9ca02a663c3eee2698eb360dd5dc7afb1951e743
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat May 12 11:16:59 2012 +0100
duplicate SYSTEM_[LIBJPEG|JPEG] tests
we have both a SYSTEM_LIBJPEG and SYSTEM_JPEG but only SYSTEM_JPEG appears to
be used
Change-Id: Ib1a5da4c907222be33465ce06997f111c4fffe87
diff --git a/config_host.mk.in b/config_host.mk.in
index 0adc5fe..da7b3b4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -488,7 +488,6 @@ export SYSTEM_LIBCROCO=@SYSTEM_LIBCROCO@
export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
export SYSTEM_LIBGSF=@SYSTEM_LIBGSF@
-export SYSTEM_LIBJPEG=@SYSTEM_LIBJPEG@
export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
export SYSTEM_LIBRSVG=@SYSTEM_LIBRSVG@
export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@
diff --git a/configure.in b/configure.in
index 595ba71..4dd184c 100644
--- a/configure.in
+++ b/configure.in
@@ -10623,32 +10623,6 @@ fi
AC_SUBST(SYSTEM_LIBPNG)
dnl ===================================================================
-dnl Test whether to build libjpeg or rely on the system version
-dnl ===================================================================
-dnl FIXME: this is currently because we have jpeg-6b for our filters
-dnl and jpeg-8 as dependency for librsvg
-dnl this should be unified into using only one version for both
-
-AC_MSG_CHECKING([whether to use the system libjpeg])
-
-if test "$SYSTEM_JPEG" = "YES"; then
- SYSTEM_LIBJPEG=YES
- AC_MSG_RESULT([yes])
-else
- case "$_os" in
- WINNT|Darwin|iOS|Android)
- SYSTEM_LIBJPEG=NO
- AC_MSG_RESULT([no])
- ;;
- *)
- SYSTEM_LIBJPEG=YES
- AC_MSG_RESULT([yes])
- ;;
- esac
-fi
-AC_SUBST(SYSTEM_LIBJPEG)
-
-dnl ===================================================================
dnl Check for runtime JVM search path
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
diff --git a/jpeg/jpeg-6b.patch b/jpeg/jpeg-6b.patch
deleted file mode 100644
index 1180e7a..0000000
--- a/jpeg/jpeg-6b.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- misc/jpeg-6b/jconfig.h 2009-03-19 11:30:46.000000000 +0100
-+++ misc/build/jpeg-6b/jconfig.h 2009-03-19 11:30:30.000000000 +0100
-@@ -1 +1,16 @@
--dummy
-+#define HAVE_PROTOTYPES
-+#define HAVE_UNSIGNED_CHAR
-+#define HAVE_UNSIGNED_SHORT
-+#undef CHAR_IS_UNSIGNED
-+#define HAVE_STDDEF_H
-+#define HAVE_STDLIB_H
-+#undef NEED_BSD_STRINGS
-+#undef NEED_SYS_TYPES_H
-+#undef NEED_FAR_POINTERS
-+#undef NEED_SHORT_EXTERNAL_NAMES
-+#undef INCOMPLETE_TYPES_BROKEN
-+
-+#ifdef JPEG_INTERNALS
-+#undef RIGHT_SHIFT_IS_UNSIGNED
-+#define NO_GETENV
-+#endif
---- misc/jpeg-6b/jmorecfg.h 1997-08-10 01:58:56.000000000 +0200
-+++ misc/build/jpeg-6b/jmorecfg.h 2009-03-19 11:30:30.000000000 +0100
-@@ -157,8 +157,8 @@
-
- /* INT32 must hold at least signed 32-bit values. */
-
--#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
--typedef long INT32;
-+#if !defined XMD_H && !defined _SOLAR_H /* X11/xmd.h correctly defines INT32 */
-+typedef int INT32;
- #endif
-
- /* Datatype used for image dimensions. The JPEG standard only supports
---- misc/jpeg-6b/makefile.mk 2009-03-19 11:30:46.000000000 +0100
-+++ misc/build/jpeg-6b/makefile.mk 2009-03-19 11:30:30.000000000 +0100
-@@ -1 +1,76 @@
--dummy
-+#*************************************************************************
-+#
-+# Copyright according the GNU Public License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..
-+
-+PRJNAME=jpeg
-+TARGET=jpeglib
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+VISIBILITY_HIDDEN=TRUE
-+
-+# --- Settings -----------------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+
-+.IF "$(GUI)$(CPU)"=="WNTP"
-+CFLAGS=$(CFLAGS) -Od
-+.ENDIF
-+
-+# --- Files --------------------------------------------------------
-+
-+SLOFILES= $(SLO)$/jcapimin.obj \
-+ $(SLO)$/jcapistd.obj \
-+ $(SLO)$/jccoefct.obj \
-+ $(SLO)$/jccolor.obj \
-+ $(SLO)$/jcdctmgr.obj \
-+ $(SLO)$/jcinit.obj \
-+ $(SLO)$/jchuff.obj \
-+ $(SLO)$/jcphuff.obj \
-+ $(SLO)$/jcmainct.obj \
-+ $(SLO)$/jcmarker.obj \
-+ $(SLO)$/jcmaster.obj \
-+ $(SLO)$/jcomapi.obj \
-+ $(SLO)$/jcparam.obj \
-+ $(SLO)$/jcprepct.obj \
-+ $(SLO)$/jcsample.obj \
-+ $(SLO)$/jdhuff.obj \
-+ $(SLO)$/jdinput.obj \
-+ $(SLO)$/jdtrans.obj \
-+ $(SLO)$/jdapimin.obj \
-+ $(SLO)$/jdapistd.obj \
-+ $(SLO)$/jdatadst.obj \
-+ $(SLO)$/jdatasrc.obj \
-+ $(SLO)$/jdcoefct.obj \
-+ $(SLO)$/jdcolor.obj \
-+ $(SLO)$/jddctmgr.obj \
-+ $(SLO)$/jdphuff.obj \
-+ $(SLO)$/jdmainct.obj \
-+ $(SLO)$/jdmarker.obj \
-+ $(SLO)$/jdmaster.obj \
-+ $(SLO)$/jdmerge.obj \
-+ $(SLO)$/jdpostct.obj \
-+ $(SLO)$/jdsample.obj \
-+ $(SLO)$/jerror.obj \
-+ $(SLO)$/jfdctflt.obj \
-+ $(SLO)$/jfdctfst.obj \
-+ $(SLO)$/jfdctint.obj \
-+ $(SLO)$/jidctflt.obj \
-+ $(SLO)$/jidctfst.obj \
-+ $(SLO)$/jidctint.obj \
-+ $(SLO)$/jidctred.obj \
-+ $(SLO)$/jmemmgr.obj \
-+ $(SLO)$/jmemnobs.obj \
-+ $(SLO)$/jquant1.obj \
-+ $(SLO)$/jquant2.obj \
-+ $(SLO)$/jutils.obj
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+.INCLUDE : target.mk
diff --git a/jpeg/makefile.mk b/jpeg/makefile.mk
index adc0c66..839fbd6 100644
--- a/jpeg/makefile.mk
+++ b/jpeg/makefile.mk
@@ -42,13 +42,10 @@ all:
# --- Files --------------------------------------------------------
-#TARFILE_NAME=jpeg-6b
TARFILE_NAME=jpeg-8c
-#TARFILE_MD5=dbd5f3b47ed13132f04c685d608a7547
TARFILE_MD5=a2c10c04f396a9ce72894beb18b4e1f9
-#PATCH_FILES=jpeg-6b.patch
PATCH_FILES=jpeg-8c.patch
ADDITIONAL_FILES=makefile.mk jconfig.h
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0702c7e..b385f8d 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -453,10 +453,6 @@ SCPDEFS+=-DSYSTEM_GLIB
SCPDEFS+=-DSYSTEM_LIBCROCO
.ENDIF
-.IF "$(SYSTEM_LIBJPEG)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBJPEG
-.ENDIF
-
.IF "$(ENABLE_LIBRSVG)" == "INTERNAL"
SCPDEFS+=-DENABLE_LIBRSVG
.ENDIF
commit 2a42638c79cf9a8297b822dc9842618f1f2f8779
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat May 12 11:02:41 2012 +0100
drop debugging spew
Change-Id: I680a5d10d129ff9b7d6d543b0914418eedf078c6
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index e8253b9..1c70184 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -102,28 +102,12 @@ $(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(i18npool_GENBRKTARGET)
# NOTE: strips every line with _word_ 'Prepend', including $Prepend
$(i18npool_BIDIR)/%.txt : \
$(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir
-ifeq ($(GUI)$(COM),WNTGCC)
- echo DEBUG i18npool ICU_RECLASSIFIED_CLOSE_PARENTHESIS=$(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
- echo DEBUG i18npool ICU_RECLASSIFIED_PREPEND_SET_EMPTY=$(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
- cat $(SRC_ROOT)/config_host.mk
- cat $(SRC_ROOT)/config.log
- cat $(SRC_ROOT)/configure
-endif
ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES)
ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES)
-ifeq ($(GUI)$(COM),WNTGCC)
- echo DEBUG both
-endif
sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< | sed "/Prepend/d" > $@
else
-ifeq ($(GUI)$(COM),WNTGCC)
- echo DEBUG only one
-endif
sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
endif
-ifeq ($(GUI)$(COM),WNTGCC)
- cat $@
-endif
else
cp $< $@
endif
commit eca06e79c3f2ca02aa30e2e8ec140a7a10c999c3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat May 12 10:57:44 2012 +0100
callcatcher: update unused code list
Change-Id: I2b21cb0b6d9164b18594e2c122ce242062be276d
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 56f04e9..a81f889 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -71,8 +71,6 @@ protected:
public:
- EditBox( Window* pParent,
- WinBits nWinStyle = WB_LEFT | WB_BORDER );
EditBox( Window* pParent, const ResId& rResId );
virtual ~EditBox();
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 46696e7..a0d1815 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -45,10 +45,6 @@
namespace formula
{
-FormulaListBox::FormulaListBox( Window* pParent, WinBits nWinStyle):
- ListBox(pParent,nWinStyle)
-{}
-
FormulaListBox::FormulaListBox( Window* pParent, const ResId& rResId ):
ListBox(pParent,rResId)
{}
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index ec75b05..69f4d85 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -59,8 +59,6 @@ protected:
virtual long PreNotify( NotifyEvent& rNEvt );
public:
- FormulaListBox( Window* pParent, WinBits nWinStyle = WB_BORDER );
-
FormulaListBox( Window* pParent, const ResId& rResId );
};
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 5673304..0bef541 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -672,29 +672,6 @@ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd )
#*
#* Function: Constructor from Class ArgInput
#*
-#* Input: Parent, Window-Style
-#*
-#* Output: ---
-#*
-#************************************************************************/
-EditBox::EditBox( Window* pParent,WinBits nWinStyle)
- :Control(pParent,nWinStyle|WB_DIALOGCONTROL)
-{
- pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | (nWinStyle & WB_TABSTOP) |
- WB_NOBORDER | WB_NOHIDESELECTION | WB_IGNORETAB);
-
- pMEdit->Show();
- aOldSel=pMEdit->GetSelection();
-}
-
-/*************************************************************************
-#* Member: EditBox Date:20.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: EditBox
-#*
-#* Function: Constructor from Class ArgInput
-#*
#* Input: Parent, Resource
#*
#* Output: ---
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index d13455f..5cb20ef 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -485,7 +485,6 @@ class SVT_DLLPUBLIC FontStyleBox : public ComboBox
private:
using ComboBox::SetText;
public:
- FontStyleBox( Window* pParent, WinBits nWinStyle = 0 );
FontStyleBox( Window* pParent, const ResId& rResId );
virtual ~FontStyleBox();
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 5029aa7..cd528ec 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1442,13 +1442,6 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
// FontStyleBox
// ===================================================================
-FontStyleBox::FontStyleBox( Window* pParent, WinBits nWinStyle ) :
- ComboBox( pParent, nWinStyle )
-{
-}
-
-// -------------------------------------------------------------------
-
FontStyleBox::FontStyleBox( Window* pParent, const ResId& rResId ) :
ComboBox( pParent, rResId )
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 6a71b43..4ad7d19 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,7 +1,6 @@
FmFieldWinMgr::GetChildWindowId()
FmPropBrwMgr::GetChildWindowId()
FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool)
-FontStyleBox::FontStyleBox(Window*, long)
HTMLControls::Insert(HTMLControl const*&, unsigned short&)
HTMLControls::Insert(HTMLControl const**, unsigned short)
HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
@@ -30,10 +29,6 @@ ScAddInDocs::Insert(ScDocument* const&, unsigned short&)
ScAddInDocs::Insert(ScDocument* const*, unsigned short)
ScAddInDocs::Remove(ScDocument* const&, unsigned short)
ScChartListener::SetName(rtl::OUString const&)
-ScColorScaleFormatList::begin()
-ScColorScaleFormatList::begin() const
-ScColorScaleFormatList::end()
-ScColorScaleFormatList::end() const
ScCompressedArray<int, unsigned char>::GetEntryCount() const
ScCompressedArray<int, unsigned short>::CopyFrom(ScCompressedArray<int, unsigned short> const&, int, int, long)
ScCompressedArray<int, unsigned short>::GetEntryCount() const
@@ -668,8 +663,6 @@ dp_misc::writeConsoleError(rtl::OString const&)
drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const
drawinglayer::attribute::SdrTextAttribute::getPropertiesVersion() const
drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const
-formula::EditBox::EditBox(Window*, long)
-formula::FormulaListBox::FormulaListBox(Window*, long)
formula::FormulaTokenIterator::First()
jfw_plugin::VendorBase::createInstance()
nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&)
More information about the Libreoffice-commits
mailing list