[libreoffice/f19] use git to manage patches
David Tardon
dtardon at fedoraproject.org
Fri Feb 28 20:30:09 UTC 2014
commit 8fee3d2b7e1ffbb1303d98f3258fcdf52acead09
Author: David Tardon <dtardon at redhat.com>
Date: Mon Feb 3 21:57:23 2014 +0100
use git to manage patches
Conflicts:
libreoffice.spec
...1057977-avoid-use-of-invalidated-pointers.patch | 24 ++++----
libreoffice-installfix.patch | 32 ++++++++---
libreoffice.spec | 54 ++++++--------------
...ffice.org-2.0.2.rh188467.printingdefaults.patch | 25 ++++++---
openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch | 24 +++++++--
...e.org-3.1.0.ooo101274.opening-a-directory.patch | 2 +-
...ce.org-3.1.0.oooXXXXX.solenv.allowmissing.patch | 40 +++++++--------
7 files changed, 107 insertions(+), 94 deletions(-)
---
diff --git a/0001-rhbz-1057977-avoid-use-of-invalidated-pointers.patch b/0001-rhbz-1057977-avoid-use-of-invalidated-pointers.patch
index 563d634..daec481 100644
--- a/0001-rhbz-1057977-avoid-use-of-invalidated-pointers.patch
+++ b/0001-rhbz-1057977-avoid-use-of-invalidated-pointers.patch
@@ -1,4 +1,4 @@
-From 6b127d40c7d57745bc602d9ff7914392f9d3b92b Mon Sep 17 00:00:00 2001
+From d80d8347ac7b538cebce6eb4a36e63d91833d850 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Wed, 5 Feb 2014 10:55:25 +0100
Subject: [PATCH] rhbz#1057977 avoid use of invalidated pointers
@@ -10,10 +10,10 @@ Change-Id: Ib81f79da696b5e8002f5a2ddcf160903231dc3f1
2 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
-index 8a7c439..4223135 100644
+index b3a2f9e..bf372e4 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
-@@ -537,9 +537,15 @@ protected:
+@@ -544,9 +544,15 @@ protected:
OutputDevice();
private:
@@ -30,10 +30,10 @@ index 8a7c439..4223135 100644
virtual ~OutputDevice();
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
-index 5c5dcf2..c347f71 100644
+index e506d0d..261d4f1 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
-@@ -154,7 +154,7 @@ static void ImplRotatePos( long nOriginX, long nOriginY, long& rX, long& rY,
+@@ -156,7 +156,7 @@ static void ImplRotatePos( long nOriginX, long nOriginY, long& rX, long& rY,
}
}
@@ -42,7 +42,7 @@ index 5c5dcf2..c347f71 100644
{
// the currently selected logical font is no longer needed
if ( mpFontEntry )
-@@ -205,6 +205,38 @@ void OutputDevice::ImplUpdateFontData( bool bNewFontLists )
+@@ -207,6 +207,38 @@ void OutputDevice::ImplUpdateFontData( bool bNewFontLists )
delete mpFontList;
if( mpFontCache && mpFontCache != pSVData->maGDIData.mpScreenFontCache )
delete mpFontCache;
@@ -78,10 +78,10 @@ index 5c5dcf2..c347f71 100644
+ {
+ if( mpPDFWriter )
+ {
- mpFontList = pSVData->maGDIData.mpScreenFontList->Clone( true, true );
- mpFontCache = new ImplFontCache();
+ mpFontList = mpPDFWriter->filterDevFontList( pSVData->maGDIData.mpScreenFontList );
+ mpFontCache = new ImplFontCache( sal_False );
}
-@@ -222,16 +254,24 @@ void OutputDevice::ImplUpdateFontData( bool bNewFontLists )
+@@ -227,16 +259,24 @@ void OutputDevice::ImplUpdateFontData( bool bNewFontLists )
Window* pChild = ((Window*)this)->mpWindowImpl->mpFirstChild;
while ( pChild )
{
@@ -107,7 +107,7 @@ index 5c5dcf2..c347f71 100644
// clear global font lists to have them updated
pSVData->maGDIData.mpScreenFontCache->Invalidate();
if ( bNewFontLists )
-@@ -250,16 +290,23 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists )
+@@ -255,16 +295,23 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists )
}
}
@@ -133,7 +133,7 @@ index 5c5dcf2..c347f71 100644
pSysWin = pSysWin->mpWindowImpl->mpNextOverlap;
}
-@@ -270,7 +317,7 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists )
+@@ -275,7 +322,7 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists )
VirtualDevice* pVirDev = pSVData->maGDIData.mpFirstVirDev;
while ( pVirDev )
{
@@ -142,7 +142,7 @@ index 5c5dcf2..c347f71 100644
pVirDev = pVirDev->mpNext;
}
-@@ -278,7 +325,7 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists )
+@@ -283,7 +330,7 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists )
Printer* pPrinter = pSVData->maGDIData.mpFirstPrinter;
while ( pPrinter )
{
diff --git a/libreoffice-installfix.patch b/libreoffice-installfix.patch
index cc5f03e..e2448a5 100644
--- a/libreoffice-installfix.patch
+++ b/libreoffice-installfix.patch
@@ -1,10 +1,24 @@
---- a/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:38.000000000 +0000
-+++ b/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:42.000000000 +0000
-@@ -204,7 +204,6 @@
+From 2ed57bc3ba020ebc6aec933445ae0b274685499e Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Mon, 3 Feb 2014 21:41:00 +0100
+Subject: [PATCH] installation fix
+
+---
+ solenv/bin/modules/installer/worker.pm | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
+index aab676f..0e6f67d 100644
+--- a/solenv/bin/modules/installer/worker.pm
++++ b/solenv/bin/modules/installer/worker.pm
+@@ -96,7 +96,6 @@ sub create_installation_directory
- $installdir = installer::systemactions::create_directories("install", $languageref);
- installer::logger::print_message( "... creating installation set in $installdir ...\n" );
-- remove_old_installation_sets($installdir);
- my $inprogressinstalldir = $installdir . "_inprogress";
- installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
- $installdir = $inprogressinstalldir;
+ $installdir = installer::systemactions::create_directories("install", $languageref);
+ installer::logger::print_message( "... creating installation set in $installdir ...\n" );
+- remove_old_installation_sets($installdir);
+ my $inprogressinstalldir = $installdir . "_inprogress";
+ installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
+ $installdir = $inprogressinstalldir;
+--
+1.8.4.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 3f0ea8b..b646020 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -96,6 +96,7 @@ BuildRequires: doxygen
BuildRequires: findutils
BuildRequires: flex
BuildRequires: gcc-c++
+BuildRequires: git
BuildRequires: gperf
BuildRequires: icu
BuildRequires: make
@@ -1026,6 +1027,15 @@ done \
%prep
%setup -q -n %{name}-%{version}%{?libo_prerelease} -b 1 -b 2
rm -rf git-hooks */git-hooks
+
+# set up git repo
+git init
+git config user.name rpmbuild
+git config user.email rpmbuild at fedoraproject.org
+git config gc.auto 0 # disable auto packing
+git add -A
+git commit -q -a -m %{name}-%{version}
+
#Customize Palette to remove Sun colours and add Red Hat colours
(head -n -1 extras/source/palettes/standard.soc && \
echo -e ' <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
@@ -1035,44 +1045,10 @@ rm -rf git-hooks */git-hooks
<draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
mv -f redhat.soc extras/source/palettes/standard.soc
-%patch1 -p1
-%patch2 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch3 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch4 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch5 -p1 -b .ooo101274.opening-a-directory.patch
-%patch6 -p1 -b .libreoffice-installfix.patch
-%if 0%{?rhel} && 0%{?rhel} < 7
-%patch7 -p1 -b .rhel6gcj.patch
-%patch8 -p1 -b .rhel6poppler.patch
-%patch9 -p1 -b .rhel6langs.patch
-%patch10 -p1 -b .rhel6limits.patch
-%patch11 -p1 -b .rhel6glib.patch
-%endif
-%patch12 -p1 -b .do-not-build-LibreOffice_Test.patch
-%patch13 -p1 -b .fdo-48835-application-menu-for-LibreOffice.patch
-%patch14 -p1 -b .Make-charmap.cxx-compile-with-icu-4.4.patch
-%patch15 -p1 -b .select-sheet-menu-as-a-right-click-popup-to-the-prev.patch
-%patch16 -p1 -b .rhbz-1013480-crash-in-EditLineList-operator.patch
-%patch17 -p1 -b .rhbz-1015281-crash-on-clicking-custom-anima.patch
-%patch18 -p1 -b .rhbz-919070-display-1-means-span-all-display.patch
-%patch19 -p1 -b .rhbz-1021915-force-menubar-menus-to-be-up-d.patch
-%patch20 -p1 -b .update-libmwaw-to-0.2.0.patch
-%patch21 -p1 -b .add-config.-for-formats-newly-supported-by-libmwaw.patch
-%patch22 -p1 -b .enable-more-formats-supported-by-libmwaw.patch
-%patch23 -p1 -b .Rewrite-Qt4-based-nested-yield-mutex-locking.patch
-%patch24 -p1 -b .rhbz-1032774-bodge-around-reported-NULL-valu.pat
-%patch25 -p1 -b .rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch
-%patch26 -p1 -b .rhbz-1038189-refresh-printer-list-when-prin.patch
-%patch27 -p1 -b .rhbz-1039517-ml-short-cut-keys-are-unavailab.patch
-%patch28 -p1 -b .rhbz-1047871-conditional-formatting-doesn-t-.patch
-%patch29 -p1 -b .Resolves-rhbz-1050162-don-t-draw-to-NULL-window.patch
-%patch30 -p1 -b .Resolves-rhbz-1010995-div-by-0-on-some-bizarre-corne.patch
-%patch31 -p1 -b .rhbz-1065807-rework-i66157-for-multiple-writ.patch
-%patch32 -p1 -b .rhbz-1065807-use-xdg-Templates-for-default-.patch
-%patch33 -p1 -b .explictly-list-common-lang-independant-template-dir.patch
-%patch34 -p1 -b .rhbz-1057977-avoid-use-of-invalidated-pointers.patch
-%patch35 -p1 -b .KDE-don-t-throw-on-TemplatePathVariable.patch
-%patch36 -p1 -b .rhbz-1007697-Update-on-a-Window-triggering-.patch
+git commit -q -a -m 'add Red Hat colors to palette'
+
+# apply patches
+git am %{patches}
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@@ -1084,6 +1060,8 @@ cp -r translations/source/en-GB translations/source/ms
cp -r translations/source/en-GB translations/source/ur
%endif
+git commit -q -a -m 'fix translations'
+
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
echo building localizations: %{langpack_langs}
diff --git a/openoffice.org-2.0.2.rh188467.printingdefaults.patch b/openoffice.org-2.0.2.rh188467.printingdefaults.patch
index 45c40aa..8a6dbce 100644
--- a/openoffice.org-2.0.2.rh188467.printingdefaults.patch
+++ b/openoffice.org-2.0.2.rh188467.printingdefaults.patch
@@ -1,11 +1,17 @@
-Index: configuration/ppds/SGENPRT.PS
-===================================================================
-RCS file: /cvs/external/psprint_config/configuration/ppds/SGENPRT.PS,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 SGENPRT.PS
---- openoffice.org.orig/psprint_config/configuration/ppds/SGENPRT.PS 26 Nov 2004 16:10:35 -0000 1.3
-+++ openoffice.org/psprint_config/configuration/ppds/SGENPRT.PS 30 Aug 2005 11:17:51 -0000
-@@ -58,6 +58,7 @@
+From ea8d40dfc86fd45bb64ecaa33b703eb99701c3e4 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Mon, 3 Feb 2014 19:25:59 +0100
+Subject: [PATCH] rhbz#188467 printing defaults
+
+---
+ psprint_config/configuration/ppds/SGENPRT.PS | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/psprint_config/configuration/ppds/SGENPRT.PS b/psprint_config/configuration/ppds/SGENPRT.PS
+index 0446757..177e2c4 100644
+--- a/psprint_config/configuration/ppds/SGENPRT.PS
++++ b/psprint_config/configuration/ppds/SGENPRT.PS
+@@ -42,6 +42,7 @@
*ColorDevice: True
*DefaultColorSpace: RGB
*LanguageLevel: "2"
@@ -13,3 +19,6 @@ diff -u -p -u -r1.3 SGENPRT.PS
*% --- For None Color or old PostScript(R) printers use following lines ---
*% *ColorDevice: False
+--
+1.8.4.2
+
diff --git a/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch b/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
index b5a7ff7..2186171 100644
--- a/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+++ b/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
@@ -1,13 +1,24 @@
---- openoffice.org.orig/desktop/scripts/unopkg.sh 2008-01-14 15:55:26.000000000 +0000
-+++ openoffice.org/desktop/scripts/unopkg.sh 2008-02-14 10:52:10.000000000 +0000
-@@ -62,6 +62,33 @@
+From 3b77bbe76b9f99d871074e8baa6e0845f4756442 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Mon, 3 Feb 2014 20:24:50 +0100
+Subject: [PATCH] i#86080 unopkg bodge
+
+---
+ desktop/scripts/unopkg.sh | 33 +++++++++++++++++++++++++++++++--
+ 1 file changed, 31 insertions(+), 2 deletions(-)
+
+diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
+index d16d226..aefc918 100755
+--- a/desktop/scripts/unopkg.sh
++++ b/desktop/scripts/unopkg.sh
+@@ -53,6 +53,33 @@ AIX)
;;
esac
+isnotuser=0
+for arg in $@
+do
-+if [ "$arg" = "--shared" -o "$arg" = "--bundled" ]; then
++if [ "$arg" = "--shared" -o "$arg" = "--bundled" ]; then
+ isnotuser=1
+fi
+done
@@ -34,7 +45,7 @@
#collect all bootstrap variables specified on the command line
#so that they can be passed as arguments to javaldx later on
for arg in $@
-@@ -110,6 +137,8 @@
+@@ -92,6 +119,8 @@ unset XENVIRONMENT
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
# execute binary
@@ -45,3 +56,6 @@
+if [ -n "$INSTDIR" ]; then
+ rm -rf $INSTDIR
+fi
+--
+1.8.4.2
+
diff --git a/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch b/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
index 9bfc221..77ed100 100644
--- a/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+++ b/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
@@ -109,7 +109,7 @@ index 95e589f..d7fc181 100644
+ xInteraction->handle(xRequest);
+ }
+}
-+
++
+}
+
//=========================================================================
diff --git a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
index 0641054..1e994db 100644
--- a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+++ b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
@@ -1,12 +1,18 @@
-Index: bin/modules/installer/scriptitems.pm
-===================================================================
-RCS file: /cvs/tools/solenv/bin/modules/installer/scriptitems.pm,v
-retrieving revision 1.17
-diff -u -p -r1.17 scriptitems.pm
---- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm 24 Feb 2005 16:21:15 -0000 1.17
-+++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000
-@@ -1356,11 +1356,10 @@
+From eab93c587dd524241f63e885b0e4ac8700da5d16 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Mon, 3 Feb 2014 20:31:04 +0100
+Subject: [PATCH] solenv: allow missing files
+---
+ solenv/bin/modules/installer/scriptitems.pm | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
+index 4c384ce..963ca84 100644
+--- a/solenv/bin/modules/installer/scriptitems.pm
++++ b/solenv/bin/modules/installer/scriptitems.pm
+@@ -1133,11 +1133,10 @@ sub remove_Files_Without_Sourcedirectory
+
if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
{
- $infoline = "ERROR: Removing file $filename from file list.\n";
@@ -19,7 +25,7 @@ diff -u -p -r1.17 scriptitems.pm
next; # removing this file from list, if sourcepath is empty
}
-@@ -1368,11 +1367,10 @@
+@@ -1145,11 +1144,10 @@ sub remove_Files_Without_Sourcedirectory
{
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
{
@@ -33,7 +39,7 @@ diff -u -p -r1.17 scriptitems.pm
next; # removing this file from list, if sourcepath is empty
}
-@@ -1390,11 +1388,10 @@
+@@ -1167,11 +1165,10 @@ sub remove_Files_Without_Sourcedirectory
{
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
{
@@ -47,14 +53,6 @@ diff -u -p -r1.17 scriptitems.pm
next; # removing this file from list, if sourcepath is empty
}
---- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:26.000000000 +0100
-+++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:54.000000000 +0100
-@@ -53,7 +53,7 @@
- ( $installer::globals::packageformat eq "archive" ))
- {
- $installer::globals::is_simple_packager_project = 1;
-- $installer::globals::patch_user_dir = 1;
-+ $installer::globals::patch_user_dir = 1;
- }
- elsif( $installer::globals::packageformat eq "dmg" )
- {
+--
+1.8.4.2
+
More information about the scm-commits
mailing list