Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ali Polatel (hawking)" <hawking@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qscintilla/files: qscintilla-1.5-sandbox.patch qscintilla-2.1-qt4.patch digest-qscintilla-2.1-r1 digest-qscintilla-1.7.1 qscintilla-1.7.1.patch qscintilla-2.1-qt.patch digest-qscintilla-1.5.1
Date: Tue, 20 Nov 2007 05:17:28
Message-Id: E1IuLUA-0005e0-D1@stork.gentoo.org
1 hawking 07/11/20 05:17:22
2
3 Added: qscintilla-1.5-sandbox.patch
4 qscintilla-2.1-qt4.patch digest-qscintilla-2.1-r1
5 digest-qscintilla-1.7.1 qscintilla-1.7.1.patch
6 qscintilla-2.1-qt.patch digest-qscintilla-1.5.1
7 Log:
8 move dev-python/qscintilla to x11-libs/qscintilla and split python bindings to a separate package qscintilla-python to break circular dependency, bug 199543. install designerplugin into the correct directory, bug 196701 thanks to Franz Feller.
9 (Portage version: 2.1.3.19, RepoMan options: --force)
10
11 Revision Changes Path
12 1.1 x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch?rev=1.1&content-type=text/plain
16
17 Index: qscintilla-1.5-sandbox.patch
18 ===================================================================
19 --- Makefile.orig 2005-01-23 03:57:03.000000000 +0100
20 +++ Makefile 2005-01-23 03:57:35.000000000 +0100
21 @@ -314,7 +314,7 @@
22 QMAKE_TARGET = qscintilla
23 DESTDIR = ${destdir}/
24 TARGET = libqscintilla.so.5.2.0
25 -TARGETA = ${destdir}/libqscintilla.a
26 +TARGETA = libqscintilla.a
27 TARGETD = libqscintilla.so.5.2.0
28 TARGET0 = libqscintilla.so
29 TARGET1 = libqscintilla.so.5
30 @@ -345,17 +345,12 @@
31 all: Makefile ${destdir}/$(TARGET)
32
33 ${destdir}/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
34 - test -d ${destdir}/ || mkdir -p ${destdir}/
35 +# test -d ${destdir}/ || mkdir -p ${destdir}/
36 -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
37 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
38 -ln -s $(TARGET) $(TARGET0)
39 -ln -s $(TARGET) $(TARGET1)
40 -ln -s $(TARGET) $(TARGET2)
41 - -$(DEL_FILE) ${destdir}/$(TARGET)
42 - -$(DEL_FILE) ${destdir}/$(TARGET0)
43 - -$(DEL_FILE) ${destdir}/$(TARGET1)
44 - -$(DEL_FILE) ${destdir}/$(TARGET2)
45 - -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ${destdir}/
46
47
48
49
50
51
52 1.1 x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch
53
54 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch?rev=1.1&view=markup
55 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch?rev=1.1&content-type=text/plain
56
57 Index: qscintilla-2.1-qt4.patch
58 ===================================================================
59 --- designer.pro.ori 2006-12-13 09:31:54.000000000 +0700
60 +++ designer.pro 2006-12-13 09:40:49.000000000 +0700
61 @@ -4,12 +4,14 @@
62 TEMPLATE = lib
63 TARGET = qscintillaplugin
64
65 +INCLUDEPATH = ../Qt4
66 +
67 CONFIG += designer release plugin
68
69 HEADERS = qscintillaplugin.h
70 SOURCES = qscintillaplugin.cpp
71
72 -target.path = $$[QT_INSTALL_PLUGINS]/designer
73 +target.path = .
74 INSTALLS += target
75
76 -LIBS += -lqscintilla2
77 +LIBS += -L../Qt4/lib -lqscintilla2
78
79
80
81 1.1 x11-libs/qscintilla/files/digest-qscintilla-2.1-r1
82
83 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/digest-qscintilla-2.1-r1?rev=1.1&view=markup
84 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/digest-qscintilla-2.1-r1?rev=1.1&content-type=text/plain
85
86 Index: digest-qscintilla-2.1-r1
87 ===================================================================
88 MD5 13049717628391ca4db43f7ede0eeeb4 QScintilla-1.73-gpl-2.1.tar.gz 1866929
89 RMD160 ef114b468b3cea5d36346c915bc407ce2ad3ec65 QScintilla-1.73-gpl-2.1.tar.gz 1866929
90 SHA256 545fcefb75fe159b48e2a17485c12ba8ca548f387f594923664258b10831bf86 QScintilla-1.73-gpl-2.1.tar.gz 1866929
91
92
93
94 1.1 x11-libs/qscintilla/files/digest-qscintilla-1.7.1
95
96 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/digest-qscintilla-1.7.1?rev=1.1&view=markup
97 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/digest-qscintilla-1.7.1?rev=1.1&content-type=text/plain
98
99 Index: digest-qscintilla-1.7.1
100 ===================================================================
101 MD5 dfa047b45d4f09ae8d4a8a431ba88a5a QScintilla-1.71-gpl-1.7.1.tar.gz 1060119
102 RMD160 ba85db98e552b388510df5d1f7e0e78f52856ed2 QScintilla-1.71-gpl-1.7.1.tar.gz 1060119
103 SHA256 437e5fc6e5905f9aa7d0f4ea8eb41c96fcddf7ce3cb9b786066a315c5b9ff70c QScintilla-1.71-gpl-1.7.1.tar.gz 1060119
104
105
106
107 1.1 x11-libs/qscintilla/files/qscintilla-1.7.1.patch
108
109 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/qscintilla-1.7.1.patch?rev=1.1&view=markup
110 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/qscintilla-1.7.1.patch?rev=1.1&content-type=text/plain
111
112 Index: qscintilla-1.7.1.patch
113 ===================================================================
114 --- designer/designer.pro.orig 2006-11-14 08:35:36.000000000 -0500
115 +++ designer/designer.pro 2006-11-14 08:35:49.000000000 -0500
116 @@ -3,10 +3,12 @@
117
118 TEMPLATE = lib
119 TARGET = qscintillaplugin
120 -DESTDIR = $(QTDIR)/plugins/designer
121 +DESTDIR = .
122
123 CONFIG += qt warn_on release plugin
124
125 SOURCES += qscintillaplugin.cpp
126
127 -LIBS += -lqscintilla
128 +LIBS += -L../qt/lib -lqscintilla
129 +
130 +INCLUDEPATH += ../qt
131
132
133
134 1.1 x11-libs/qscintilla/files/qscintilla-2.1-qt.patch
135
136 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/qscintilla-2.1-qt.patch?rev=1.1&view=markup
137 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/qscintilla-2.1-qt.patch?rev=1.1&content-type=text/plain
138
139 Index: qscintilla-2.1-qt.patch
140 ===================================================================
141 --- designer.pro.orig 2006-09-16 09:07:21.000000000 -0700
142 +++ designer.pro 2007-06-24 18:57:47.000000000 -0700
143 @@ -5,8 +5,10 @@
144 TARGET = qscintillaplugin
145 DESTDIR = $(QTDIR)/plugins/designer
146
147 +INCLUDEPATH = ../Qt3
148 +
149 CONFIG += qt warn_on release plugin
150
151 SOURCES += qscintillaplugin.cpp
152
153 -LIBS += -lqscintilla2
154 +LIBS += -L../Qt3/lib -lqscintilla2
155
156
157
158 1.1 x11-libs/qscintilla/files/digest-qscintilla-1.5.1
159
160 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/digest-qscintilla-1.5.1?rev=1.1&view=markup
161 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintilla/files/digest-qscintilla-1.5.1?rev=1.1&content-type=text/plain
162
163 Index: digest-qscintilla-1.5.1
164 ===================================================================
165 MD5 9e4da4adbf9aac8a802cd73695b9786f qscintilla-1.62-gpl-1.5.1.tar.gz 727606
166 RMD160 fe7fa31ec1ecbc7f4bbf887817830630dfbd5d88 qscintilla-1.62-gpl-1.5.1.tar.gz 727606
167 SHA256 5dfc860a8d91c15775ae03f40a57f0c26f51f90b8266236e457cb8cbb3f6e30e qscintilla-1.62-gpl-1.5.1.tar.gz 727606
168
169
170
171 --
172 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups