diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2008-05-25 10:40:59 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2008-05-25 10:40:59 +0000 |
| commit | c263d107c0c6bf99deb820b04e49844a4ff5187a (patch) | |
| tree | 7857ef529405eac5273f5c7f0d0d86842941d48f /x11-libs | |
| parent | Adding missing patch. Fixes bug 223507. (diff) | |
| download | historical-c263d107c0c6bf99deb820b04e49844a4ff5187a.tar.gz historical-c263d107c0c6bf99deb820b04e49844a4ff5187a.tar.bz2 historical-c263d107c0c6bf99deb820b04e49844a4ff5187a.zip | |
And let's not forget the qt3 patch either...
Package-Manager: portage-2.1.5.2
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qscintilla/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qscintilla/Manifest | 3 | ||||
| -rw-r--r-- | x11-libs/qscintilla/files/qscintilla-2.2-qt.patch | 14 |
3 files changed, 19 insertions, 4 deletions
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog index 8382448df4a7..bd4fc3771bfa 100644 --- a/x11-libs/qscintilla/ChangeLog +++ b/x11-libs/qscintilla/ChangeLog @@ -1,10 +1,10 @@ # ChangeLog for x11-libs/qscintilla # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.10 2008/05/25 10:34:25 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.11 2008/05/25 10:40:59 yngwin Exp $ 25 May 2008; Ben de Groot <yngwin@gentoo.org> - +files/qscintilla-2.2-qt4.patch: - Adding patch that I forgot to copy over. Fixes bug 223507. + +files/qscintilla-2.2-qt.patch, +files/qscintilla-2.2-qt4.patch: + Adding patches that I forgot to copy over yesterday. Fixes bug 223507. *qscintilla-2.2 (24 May 2008) diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest index 70e59118471b..1f912b53481d 100644 --- a/x11-libs/qscintilla/Manifest +++ b/x11-libs/qscintilla/Manifest @@ -2,6 +2,7 @@ AUX qscintilla-1.5-sandbox.patch 1041 RMD160 baf1c1ce082fdcead195941e4b3d3b2cfa4 AUX qscintilla-1.7.1.patch 398 RMD160 ebbd518a1bf6068f143fa902390ab772feea9627 SHA1 1bfb73303bab3251cf7351b6d6302c212880d705 SHA256 2aee04714bd2366326c21f2a559a6db4421e2e3e548811c72ee4d37e22e8873d AUX qscintilla-2.1-qt.patch 351 RMD160 99756fe8a0105c649c7666609625f942e2ff502c SHA1 6ef678ef5c345746295be78db700e8175dc2f682 SHA256 b6c4cdfc9af82ab04e885b2e30204e291391fe9111ed34dbe12a9af36e41ede9 AUX qscintilla-2.1-qt4.patch 443 RMD160 d226eb16020ba1288e1b3c0fe418601f5134bd40 SHA1 14092204c892dbb19c1749ae629bf06944dc4cbb SHA256 0ca4ad564038c6241b80e3a48d444fd5431b478e964ab41100221580c8674a22 +AUX qscintilla-2.2-qt.patch 351 RMD160 99756fe8a0105c649c7666609625f942e2ff502c SHA1 6ef678ef5c345746295be78db700e8175dc2f682 SHA256 b6c4cdfc9af82ab04e885b2e30204e291391fe9111ed34dbe12a9af36e41ede9 AUX qscintilla-2.2-qt4.patch 443 RMD160 d226eb16020ba1288e1b3c0fe418601f5134bd40 SHA1 14092204c892dbb19c1749ae629bf06944dc4cbb SHA256 0ca4ad564038c6241b80e3a48d444fd5431b478e964ab41100221580c8674a22 DIST QScintilla-1.71-gpl-1.7.1.tar.gz 1060119 RMD160 ba85db98e552b388510df5d1f7e0e78f52856ed2 SHA1 424415960e5cbcd58306e87d1d610bd8e72f3368 SHA256 437e5fc6e5905f9aa7d0f4ea8eb41c96fcddf7ce3cb9b786066a315c5b9ff70c DIST QScintilla-1.73-gpl-2.1.tar.gz 1866929 RMD160 ef114b468b3cea5d36346c915bc407ce2ad3ec65 SHA1 ca9ac61cc3d537d7b53202ff5d8565365c3f8734 SHA256 545fcefb75fe159b48e2a17485c12ba8ca548f387f594923664258b10831bf86 @@ -11,5 +12,5 @@ EBUILD qscintilla-1.5.1.ebuild 2059 RMD160 8601c92d2f113c4add903ed5400c69c3fc6e1 EBUILD qscintilla-1.7.1.ebuild 2301 RMD160 db738559013576467202a3c52383ba74a0c6524a SHA1 36fb7fedcf14676a6b009c80fc5667c387c11218 SHA256 e393b619c84b32c9bbf8f5eeb0fbbad0599fa34da14d045c3948d77ee7fbd6b1 EBUILD qscintilla-2.1-r1.ebuild 3895 RMD160 a0612558e12afc97ba320add4bcdf73a4107032f SHA1 f1c887b5da51fb586d922f41e64f53c50df91476 SHA256 c79824dc4b98966998d77d5c7ad6c1600c27f6578e57271b009c6a18534c539e EBUILD qscintilla-2.2.ebuild 3852 RMD160 4bf262415d4705e18c6922ccac18e965992fff69 SHA1 eff2655dcb77ab0c4ca3581014df88bb90bfe2d1 SHA256 9b62695535244af133dffabcd46def8ad50172eb00baa4e6d1307d173ef999f1 -MISC ChangeLog 12147 RMD160 f8ff1bd67da1c621a35e9629d89bb8a7e102a04f SHA1 96b69a8e97063eb7ba64caaadec6fed5a2b91447 SHA256 33e41849a157c751cd19eb917abc72c370165f04617212b0d9f45ecdc3ce86c8 +MISC ChangeLog 12191 RMD160 26e56eff554f8a324341e56053fdd2893e92c6f4 SHA1 f15fb1364c1ca8c4870d7cdfc63148e1e7a543e8 SHA256 4d8bd25d935f0035d65229ad8c14b36932749c3525a8c79c1a8019ddf269873c MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d diff --git a/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch b/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch new file mode 100644 index 000000000000..3579ea2400af --- /dev/null +++ b/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch @@ -0,0 +1,14 @@ +--- designer.pro.orig 2006-09-16 09:07:21.000000000 -0700 ++++ designer.pro 2007-06-24 18:57:47.000000000 -0700 +@@ -5,8 +5,10 @@ + TARGET = qscintillaplugin + DESTDIR = $(QTDIR)/plugins/designer + ++INCLUDEPATH = ../Qt3 ++ + CONFIG += qt warn_on release plugin + + SOURCES += qscintillaplugin.cpp + +-LIBS += -lqscintilla2 ++LIBS += -L../Qt3/lib -lqscintilla2 |