| 1 |
commit: 150538f71967118acd64c7b0ad9703b8ece52ef2 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 29 15:57:16 2011 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 29 15:57:16 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=commit;h=150538f7 |
| 7 |
|
| 8 |
add bison-2.5 fix for libreoffice |
| 9 |
|
| 10 |
--- |
| 11 |
app-office/libreoffice/Manifest | 3 +- |
| 12 |
.../files/libreoffice-3.3.2-bison25.diff | 23 ++++++++++++++++++++ |
| 13 |
app-office/libreoffice/libreoffice-3.3.2.ebuild | 1 + |
| 14 |
3 files changed, 26 insertions(+), 1 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 17 |
index 133f93b..4bca768 100644 |
| 18 |
--- a/app-office/libreoffice/Manifest |
| 19 |
+++ b/app-office/libreoffice/Manifest |
| 20 |
@@ -6,6 +6,7 @@ AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 S |
| 21 |
AUX libreoffice-3.3-libpng-1.5.diff 522 RMD160 4bc6ad8cec9c35d5a30b87c71d78deb75d42e184 SHA1 caf49686b19f11b56ea929494d16a56cc4e05326 SHA256 13c5d10642c2f044293186eb46de0611dd36ee3f0f3134ea2b3ea2c6ed6984f8 |
| 22 |
AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ceb4b862ec0f8a95099367b0 SHA1 a888ff72ba4998ccc59cd88c31db452c715e3c34 SHA256 bf177f6445f67a1a2d9ac972e835b1308835ba4c1358f582939345caf469079c |
| 23 |
AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e |
| 24 |
+AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b |
| 25 |
AUX libreoffice-3.3.2-gcc46.diff 13710 RMD160 30039ccaa4cc068532546625dfb4ed36b338503d SHA1 cfb3008a61168e94a928a213c7a8da459676cbae SHA256 fb35713bf8e85239dc6b1f5c7529eff720417254a004f53c2fea86945941c453 |
| 26 |
AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a |
| 27 |
AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9 |
| 28 |
@@ -88,4 +89,4 @@ DIST libreoffice-testing-3.3.2.2.tar.bz2 50946350 RMD160 eeee1b4f985ee6897def774 |
| 29 |
DIST libreoffice-ure-3.3.2.2.tar.bz2 6165456 RMD160 016a6e690e02e41519e2d64d174f542b5a4e50f2 SHA1 40261e8a9605e504661111c41229ce0ee2986844 SHA256 37b340c3b476e1c7a95c4406228848d8afe0b5f8188af7a4f01f7fa5772232ea |
| 30 |
DIST libreoffice-writer-3.3.2.2.tar.bz2 6778875 RMD160 db0b4ae2c1c93c6e35e93e48ee4ce5bdc1e963dc SHA1 d0d329bd1659c3d943c746c4f8cc76379094d7cc SHA256 3b7fe1fa2a889b5358a958c8e669505fa81251164c773d3dad650ce53009a973 |
| 31 |
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c |
| 32 |
-EBUILD libreoffice-3.3.2.ebuild 17977 RMD160 a5698175eff89ca8dc7c1a4d1569802424ecd353 SHA1 5e9e6edaba54c79d35c0c5fa3ea5e758173bd9bc SHA256 1749ffeae18f2df741ef0ee7a8eb9bb1105f9c5a2dadd0248dedb1fadbbd01d1 |
| 33 |
+EBUILD libreoffice-3.3.2.ebuild 18040 RMD160 d5429343e7fa7059c3d11dcf22ff156383e7b5fa SHA1 45e5badc2ff98273ed2ecdcca71f04fd16124ef0 SHA256 f1ec56e7da38fd04c7792f156feca38a19ca05fe46adcbcb3b621f11492ad9ec |
| 34 |
|
| 35 |
diff --git a/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff b/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff |
| 36 |
new file mode 100644 |
| 37 |
index 0000000..869b6c8 |
| 38 |
--- /dev/null |
| 39 |
+++ b/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff |
| 40 |
@@ -0,0 +1,23 @@ |
| 41 |
+--- connectivity/source/parse/sqlbison.y 2011-05-20 13:21:02.000000000 -0600 |
| 42 |
++++ connectivity/source/parse/sqlbison.y 2011-05-20 13:22:11.000000000 -0600 |
| 43 |
+@@ -4338,7 +4338,7 @@ |
| 44 |
+ } |
| 45 |
+ |
| 46 |
+ // ------------------------------------------------------------------------- |
| 47 |
+-void OSQLParser::error(sal_Char *fmt) |
| 48 |
++void OSQLParser::error(const sal_Char *fmt) |
| 49 |
+ { |
| 50 |
+ if(!m_sErrorMessage.getLength()) |
| 51 |
+ { |
| 52 |
+--- connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:58.000000000 -0600 |
| 53 |
++++ connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:46.000000000 -0600 |
| 54 |
+@@ -233,7 +233,7 @@ |
| 55 |
+ // returns the type for a parameter in a given function name |
| 56 |
+ static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos); |
| 57 |
+ |
| 58 |
+- void error(sal_Char *fmt); |
| 59 |
++ void error(const sal_Char *fmt); |
| 60 |
+ int SQLlex(); |
| 61 |
+ #ifdef YYBISON |
| 62 |
+ void setParseTree(OSQLParseNode * pNewParseTree); |
| 63 |
+ |
| 64 |
|
| 65 |
diff --git a/app-office/libreoffice/libreoffice-3.3.2.ebuild b/app-office/libreoffice/libreoffice-3.3.2.ebuild |
| 66 |
index 357efbc..32cc514 100644 |
| 67 |
--- a/app-office/libreoffice/libreoffice-3.3.2.ebuild |
| 68 |
+++ b/app-office/libreoffice/libreoffice-3.3.2.ebuild |
| 69 |
@@ -268,6 +268,7 @@ src_prepare() { |
| 70 |
cp -f "${FILESDIR}/${PN}-3.3-libpng-1.5.diff" "${S}/patches/hotfixes" |
| 71 |
cp -f "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff" "${S}/patches/hotfixes" |
| 72 |
cp -f "${FILESDIR}/${PN}-libdb5-fix-check.diff" "${S}/patches/hotfixes" |
| 73 |
+ cp -f "${FILESDIR}/${P}-bison25.diff" "${S}/patches/hotfixes" |
| 74 |
cp -f "${FILESDIR}/${PN}-3.3.2-gcc46.diff" "${S}/patches/hotfixes" |
| 75 |
|
| 76 |
#Use flag checks |
Archives