From 316f46dbb8c31daa6ac7b0bbfebaa542079e7aca Mon Sep 17 00:00:00 2001 From: Dmitry Mikhirev Date: Wed, 24 Oct 2012 23:11:00 +0400 Subject: [PATCH] add missing tarball, remove unused files --- .abf.yml | 98 +++++++++---------- help-images-mdv64789.patch | 41 -------- ...g-3.1.0.oooXXXXX.solenv.allowmissing.patch | 78 --------------- xulrunner-to-mozila-plugin.pc.diff | 14 --- 4 files changed, 49 insertions(+), 182 deletions(-) delete mode 100644 help-images-mdv64789.patch delete mode 100644 openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch delete mode 100644 xulrunner-to-mozila-plugin.pc.diff diff --git a/.abf.yml b/.abf.yml index 90a9576..228a853 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,50 +1,50 @@ +--- sources: - "067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz": 025d5d0d566a23ddb353495c116116c1088ba2e9 - "0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz": 9cc8d29cc129d1aca1a1f24e799eebd6f2f1b93d - "0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz": c67f67b4b8ae46ef94bc8c09dc29ff66d5796d37 - "0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2": e578b6c8e8fe4b20ae030fc14959b92cb6b1aba4 - "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip": 7168b0f40aa5c72267899601c116d2348d2f56ec - "1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz": 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3 - "185d60944ea767075d27247c3162b3bc-unowinreg.dll": 0619ed3a89644bef318df67db12045b2b590585b - "18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz": 1dcd28d3fc7af42ceb63006cdc56aa55ac66d355 - "1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz": 8f949ae74a6d66278a595bd063f13e0ad196d14a - "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz": 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 - "284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz": d55390a4242ad61f034291f1c854ab037e508272 - "2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz": 32d2298c78132a629ed2ac6c9830b4d52770ce02 - "2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz": efc1ab026e8e9ac4cd150cb4cf1b7e4663cddc84 - "2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz": 5c604f102e0716597b3d2659ac3e77f80a02f22d - "327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz": 67d5fabda2f5777ca8387766539b9c871d993133 - "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip": 3232dd31859be4f7eb443c33e8e3287f394789a0 - "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip": 1acea86fd399ed7817879d36370d3d1f8b109050 - "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip": b92930010622906778f713fb8f0153fa0683d018 - "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip": e393beea80d36ff27b732882c706826988a64f5c - "3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz": 9408c7ebfba2e64065bc09016192e8513ba949a0 - "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz": 76d6788e747e78abb5abf8eaad78d3342da5f2a4 - "48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz": cd6778a5272f5d05c0c5f86593bfc42d503f1dda - "6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2": a65ce43becd7b4ad265fd96a5c81a549538656f9 - "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip": 8a90669029e107b61953b90ba11545fef586c2ca - "86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz": f708f0adb4b1e45fc041cc7152d467bf818c0fc9 - "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip": a637c0c3ad3be32d6814972e1c45e547c5f6359d - "94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2": 9fc1269f7b3fdcd6064c853efcca4704bfa08449 - "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip": 47b58e0ef2d856df26372a7061ae43fae6e08051 - "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip": 2d49e11b0b711970f494294dc3698f05eb294853 - "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip": b19ad429273abb116432eae3af955ecaf1ab5b17 - "ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip": 528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba - "af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz": d490a9bb30ea9e8b95c250f4d96842e0ce0c60d7 - "apache-ant-1.8.1-bin.tar.bz2": 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1 - "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip": 1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b - "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip": 3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09 - "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip": 65dfba9970bb862d09c1f9e636b86b22f05d3936 - "e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2": c31e9994aba038f1ad85b4d3a2e7e9d9317bdaf5 - "ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz": 51537a09aa546336b0477c70077f3e21d857caa7 - "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip": 43a7ff11dd15370d456b20a093e1ee81279163a0 - "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip": 5ecb895ffc1eff2c381fa78d2197d0c57422b3df - "fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz": 55e08ee78c15de417cbfccb9e748747095994886 - "fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz": 6e836945719e137596df1ca82f0afa809e8a2e88 - "libreoffice-binfilter-3.6.2.2.tar.xz": 1698f09d4c6f3fa39cad78d872681192669f5e52 - "libreoffice-core-3.6.2.2.tar.xz": e038ae457380862cabf9ed625c28f8f238a5bd43 - "libreoffice-dictionaries-3.6.2.2.tar.xz": 5c47c51c93632ed300f4b8cc305454b7944db317 - "libreoffice-help-3.6.2.2.tar.xz": a6546f0757d86ccd7bf97105f174dea994512be9 - "libreoffice-translations-3.6.2.2.tar.xz": ad965ab4f0f1579d4e5ac1605334622331de0deb - "Mandriva-Rosa_Icons.tar.bz2": 53448c079fcb3008d1fdec7f95305fe392460c1f - "ooo_oxygen_images-2009-06-17.tar.gz": c3dd261bfe366ac514a019b0fa829369b833c0c7 + 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz: 9cc8d29cc129d1aca1a1f24e799eebd6f2f1b93d + 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz: c67f67b4b8ae46ef94bc8c09dc29ff66d5796d37 + 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2: e578b6c8e8fe4b20ae030fc14959b92cb6b1aba4 + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: 7168b0f40aa5c72267899601c116d2348d2f56ec + 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz: 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3 + 185d60944ea767075d27247c3162b3bc-unowinreg.dll: 0619ed3a89644bef318df67db12045b2b590585b + 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz: 1dcd28d3fc7af42ceb63006cdc56aa55ac66d355 + 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz: 8f949ae74a6d66278a595bd063f13e0ad196d14a + 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz: 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 + 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz: d55390a4242ad61f034291f1c854ab037e508272 + 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz: 32d2298c78132a629ed2ac6c9830b4d52770ce02 + 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz: efc1ab026e8e9ac4cd150cb4cf1b7e4663cddc84 + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz: 5c604f102e0716597b3d2659ac3e77f80a02f22d + 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz: 67d5fabda2f5777ca8387766539b9c871d993133 + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip: 3232dd31859be4f7eb443c33e8e3287f394789a0 + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050 + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip: b92930010622906778f713fb8f0153fa0683d018 + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip: e393beea80d36ff27b732882c706826988a64f5c + 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz: 9408c7ebfba2e64065bc09016192e8513ba949a0 + 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz: 76d6788e747e78abb5abf8eaad78d3342da5f2a4 + 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz: cd6778a5272f5d05c0c5f86593bfc42d503f1dda + 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2: a65ce43becd7b4ad265fd96a5c81a549538656f9 + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca + 86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz: f708f0adb4b1e45fc041cc7152d467bf818c0fc9 + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip: a637c0c3ad3be32d6814972e1c45e547c5f6359d + 94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2: 9fc1269f7b3fdcd6064c853efcca4704bfa08449 + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip: 47b58e0ef2d856df26372a7061ae43fae6e08051 + Mandriva-Rosa_Icons.tar.bz2: 53448c079fcb3008d1fdec7f95305fe392460c1f + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip: 2d49e11b0b711970f494294dc3698f05eb294853 + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip: b19ad429273abb116432eae3af955ecaf1ab5b17 + ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip: 528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba + af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz: d490a9bb30ea9e8b95c250f4d96842e0ce0c60d7 + apache-ant-1.8.1-bin.tar.bz2: 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1 + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip: 1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b + ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2: 9f26a08a3f68452f2c67a757f9e8be86a1901f0f + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip: 3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09 + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip: 65dfba9970bb862d09c1f9e636b86b22f05d3936 + ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz: 51537a09aa546336b0477c70077f3e21d857caa7 + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip: 43a7ff11dd15370d456b20a093e1ee81279163a0 + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip: 5ecb895ffc1eff2c381fa78d2197d0c57422b3df + fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz: 55e08ee78c15de417cbfccb9e748747095994886 + fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz: 6e836945719e137596df1ca82f0afa809e8a2e88 + libreoffice-binfilter-3.6.2.2.tar.xz: 1698f09d4c6f3fa39cad78d872681192669f5e52 + libreoffice-core-3.6.2.2.tar.xz: e038ae457380862cabf9ed625c28f8f238a5bd43 + libreoffice-dictionaries-3.6.2.2.tar.xz: 5c47c51c93632ed300f4b8cc305454b7944db317 + libreoffice-help-3.6.2.2.tar.xz: a6546f0757d86ccd7bf97105f174dea994512be9 + libreoffice-translations-3.6.2.2.tar.xz: ad965ab4f0f1579d4e5ac1605334622331de0deb + ooo_oxygen_images-2009-06-17.tar.gz: c3dd261bfe366ac514a019b0fa829369b833c0c7 diff --git a/help-images-mdv64789.patch b/help-images-mdv64789.patch deleted file mode 100644 index 747356f..0000000 --- a/help-images-mdv64789.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./xmlhelp/source/cxxhelp/provider/databases.cxx.orig3 2011-12-05 15:11:11.000000000 +0000 -+++ ./xmlhelp/source/cxxhelp/provider/databases.cxx 2011-12-05 16:15:02.000000000 +0000 -@@ -303,17 +303,34 @@ rtl::OString Databases::getImagesZipFile - bool bFound = false; - if ( aSymbolsStyleName.getLength() != 0 ) - { -- rtl::OUString aZipName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_" )); -- aZipName += aSymbolsStyleName; -- aZipName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".zip" )); -- -+ rtl::OUString aZipName; -+ if (aSymbolsStyleName.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")) )) { -+ aZipName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images.zip" )); -+ } else { -+ aZipName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_" )); -+ aZipName += aSymbolsStyleName; -+ aZipName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".zip" )); -+ } - bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip ); - } - -+ // Fallbacks in case the configured style fle was not found -+ if ( ! bFound ) -+ bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_oxygen.zip" )), aImageZip ); -+ -+ if ( ! bFound ) -+ bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_crystal.zip" )), aImageZip ); -+ - if ( ! bFound ) - bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images.zip" )), aImageZip ); - - if ( ! bFound ) -+ bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_tango.zip" )), aImageZip ); -+ -+ if ( ! bFound ) -+ bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_hicontrast.zip" )), aImageZip ); -+ -+ if ( ! bFound ) - aImageZip = rtl::OUString(); - - m_aImagesZipFileURL = rtl::OUStringToOString( diff --git a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch deleted file mode 100644 index 4d90bd7..0000000 --- a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch +++ /dev/null @@ -1,78 +0,0 @@ -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 -@@ -1066,7 +1066,7 @@ - } - else - { -- $infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file -+ $infoline = "WARNING: Source for $$searchfilenameref not found!\n"; # Important message in log file - } - - push( @installer::globals::logfileinfo, $infoline); -@@ -1144,7 +1144,7 @@ - } - else - { -- $infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file -+ $infoline = "WARNING: Source for $$searchfilenameref not found!\n"; # Important message in log file - } - - push( @installer::globals::logfileinfo, $infoline); -@@ -1356,11 +1356,10 @@ - - if ( ! $installer::globals::languagepack && !$installer::globals::helppack) - { -- $infoline = "ERROR: Removing file $filename from file list.\n"; -+ $infoline = "WARNING: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - -- push(@missingfiles, "ERROR: File not found: $filename\n"); -- $error_occurred = 1; -+ push(@missingfiles, "WARNING: File not found: $filename\n"); - - next; # removing this file from list, if sourcepath is empty - } -@@ -1368,11 +1367,10 @@ - { - if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) - { -- $infoline = "ERROR: Removing file $filename from file list.\n"; -+ $infoline = "WARNING: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - -- push(@missingfiles, "ERROR: File not found: $filename\n"); -- $error_occurred = 1; -+ push(@missingfiles, "WARNING: File not found: $filename\n"); - - next; # removing this file from list, if sourcepath is empty - } -@@ -1390,11 +1388,10 @@ - { - if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) - { -- $infoline = "ERROR: Removing file $filename from file list.\n"; -+ $infoline = "WARNING: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - -- push(@missingfiles, "ERROR: File not found: $filename\n"); -- $error_occurred = 1; -+ push(@missingfiles, "WARNING: File not found: $filename\n"); - - 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 = 0; - } - elsif( $installer::globals::packageformat eq "dmg" ) - { diff --git a/xulrunner-to-mozila-plugin.pc.diff b/xulrunner-to-mozila-plugin.pc.diff deleted file mode 100644 index f9bb56c..0000000 --- a/xulrunner-to-mozila-plugin.pc.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -p -up ./extensions/source/plugin/util/makefile.pmk.orig3 ./extensions/source/plugin/util/makefile.pmk ---- extensions/source/plugin/util/makefile.pmk.orig3 2009-10-20 18:35:37.000000000 -0400 -+++ extensions/source/plugin/util/makefile.pmk 2009-10-20 18:37:43.000000000 -0400 -@@ -34,7 +34,9 @@ NOUNODOC=true - - .IF "$(SYSTEM_MOZILLA)" == "YES" - CFLAGS+=-DSYSTEM_MOZILLA --PKGCONFIG_MODULES+=$(MOZ_FLAVOUR)-plugin -+# our xulrunner devel package still has -+# mozila-plugin.pc intead of xulrunner-plugin.pc -+PKGCONFIG_MODULES+=mozilla-plugin - .ENDIF - - .IF "$(GUIBASE)" == "unx" && "$(ENABLE_GTK)" == "TRUE"