rebuilt [release 0.91-3mamba;Thu Oct 13 2016]
This commit is contained in:
parent
21626279ec
commit
e3ed1e27e0
16
inkscape-0.91-libgtk-3.22.patch
Normal file
16
inkscape-0.91-libgtk-3.22.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
=== modified file 'src/ui/clipboard.cpp'
|
||||||
|
--- src/ui/clipboard.cpp 2016-04-08 17:38:40 +0000
|
||||||
|
+++ src/ui/clipboard.cpp 2016-04-08 18:21:11 +0000
|
||||||
|
@@ -1300,7 +1300,11 @@
|
||||||
|
*/
|
||||||
|
Glib::ustring ClipboardManagerImpl::_getBestTarget()
|
||||||
|
{
|
||||||
|
+#if WITH_GTKMM_3_0
|
||||||
|
+ std::vector<Glib::ustring> targets = _clipboard->wait_for_targets();
|
||||||
|
+#else
|
||||||
|
std::list<Glib::ustring> targets = _clipboard->wait_for_targets();
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
// clipboard target debugging snippet
|
||||||
|
/*
|
||||||
|
|
64
inkscape-0.91-libgtkmm-3.18.patch
Normal file
64
inkscape-0.91-libgtkmm-3.18.patch
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
=== modified file 'src/ui/clipboard.cpp'
|
||||||
|
--- src/ui/clipboard.cpp 2016-04-02 15:15:43 +0000
|
||||||
|
+++ src/ui/clipboard.cpp 2016-04-07 16:30:32 +0000
|
||||||
|
@@ -146,8 +146,6 @@
|
||||||
|
void _setClipboardColor(guint32);
|
||||||
|
void _userWarn(SPDesktop *, char const *);
|
||||||
|
|
||||||
|
- void _inkscape_wait_for_targets(std::list<Glib::ustring> &);
|
||||||
|
-
|
||||||
|
// private properites
|
||||||
|
SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it
|
||||||
|
Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node
|
||||||
|
@@ -1302,9 +1300,7 @@
|
||||||
|
*/
|
||||||
|
Glib::ustring ClipboardManagerImpl::_getBestTarget()
|
||||||
|
{
|
||||||
|
- // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets()
|
||||||
|
- std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets();
|
||||||
|
- _inkscape_wait_for_targets(targets);
|
||||||
|
+ std::list<Glib::ustring> targets = _clipboard->wait_for_targets();
|
||||||
|
|
||||||
|
// clipboard target debugging snippet
|
||||||
|
/*
|
||||||
|
@@ -1456,39 +1452,6 @@
|
||||||
|
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
-// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see
|
||||||
|
-//
|
||||||
|
-// https://bugs.launchpad.net/inkscape/+bug/296778
|
||||||
|
-// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html
|
||||||
|
-//
|
||||||
|
-// for details. Until this has been fixed upstream we will use our own implementation
|
||||||
|
-// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc.
|
||||||
|
-void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &listTargets)
|
||||||
|
-{
|
||||||
|
- //Get a newly-allocated array of atoms:
|
||||||
|
- GdkAtom* targets = NULL;
|
||||||
|
- gint n_targets = 0;
|
||||||
|
- gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets );
|
||||||
|
- if (!test || (targets == NULL)) {
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- //Add the targets to the C++ container:
|
||||||
|
- for (int i = 0; i < n_targets; i++)
|
||||||
|
- {
|
||||||
|
- //Convert the atom to a string:
|
||||||
|
- gchar* const atom_name = gdk_atom_name(targets[i]);
|
||||||
|
-
|
||||||
|
- Glib::ustring target;
|
||||||
|
- if (atom_name) {
|
||||||
|
- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- listTargets.push_back(target);
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
/* #######################################
|
||||||
|
ClipboardManager class
|
||||||
|
####################################### */
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: inkscape
|
Name: inkscape
|
||||||
Version: 0.91
|
Version: 0.91
|
||||||
Release: 2mamba
|
Release: 3mamba
|
||||||
Summary: A SVG based generic vector-drawing application
|
Summary: A SVG based generic vector-drawing application
|
||||||
Group: Applications/Multimedia
|
Group: Applications/Multimedia
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -12,17 +12,20 @@ Patch: %{name}-0.43-desktop_file.patch
|
|||||||
Patch1: %{name}-0.47-poppler-0.12.2.patch
|
Patch1: %{name}-0.47-poppler-0.12.2.patch
|
||||||
Patch2: %{name}-0.47-gcc45.patch
|
Patch2: %{name}-0.47-gcc45.patch
|
||||||
Patch3: inkscape-0.48.5-libgc-7.4.2.patch
|
Patch3: inkscape-0.48.5-libgc-7.4.2.patch
|
||||||
|
Patch4: inkscape-0.91-libgtkmm-3.18.patch
|
||||||
|
Patch5: inkscape-0.91-libgtk-3.22.patch
|
||||||
License: GPL
|
License: GPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
BuildRequires: libGConf-devel
|
BuildRequires: libGConf-devel
|
||||||
BuildRequires: libMagick-devel
|
|
||||||
BuildRequires: libX11-devel
|
BuildRequires: libX11-devel
|
||||||
BuildRequires: libaspell-devel
|
BuildRequires: libaspell-devel
|
||||||
BuildRequires: libatk-devel
|
BuildRequires: libatk-devel
|
||||||
BuildRequires: libatkmm-devel
|
BuildRequires: libatkmm-devel
|
||||||
BuildRequires: libcairo-devel
|
BuildRequires: libcairo-devel
|
||||||
BuildRequires: libcairomm-devel
|
BuildRequires: libcairomm-devel
|
||||||
|
BuildRequires: libcdr-devel
|
||||||
|
BuildRequires: libexif-devel
|
||||||
BuildRequires: libfontconfig-devel
|
BuildRequires: libfontconfig-devel
|
||||||
BuildRequires: libfreetype-devel
|
BuildRequires: libfreetype-devel
|
||||||
BuildRequires: libgc-devel
|
BuildRequires: libgc-devel
|
||||||
@ -36,7 +39,9 @@ BuildRequires: libgsl-devel
|
|||||||
BuildRequires: libgtk2-devel
|
BuildRequires: libgtk2-devel
|
||||||
BuildRequires: libgtkmm2-devel
|
BuildRequires: libgtkmm2-devel
|
||||||
BuildRequires: libgtkspell-devel
|
BuildRequires: libgtkspell-devel
|
||||||
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: liblcms2-devel
|
BuildRequires: liblcms2-devel
|
||||||
|
BuildRequires: liblzma-devel
|
||||||
BuildRequires: libpango-devel
|
BuildRequires: libpango-devel
|
||||||
BuildRequires: libpangomm-devel
|
BuildRequires: libpangomm-devel
|
||||||
BuildRequires: libperl
|
BuildRequires: libperl
|
||||||
@ -44,14 +49,14 @@ BuildRequires: libpng-devel
|
|||||||
BuildRequires: libpoppler-devel
|
BuildRequires: libpoppler-devel
|
||||||
BuildRequires: libpoppler-glib-devel
|
BuildRequires: libpoppler-glib-devel
|
||||||
BuildRequires: libpopt-devel
|
BuildRequires: libpopt-devel
|
||||||
|
BuildRequires: librevenge-devel
|
||||||
BuildRequires: libsigc++-devel
|
BuildRequires: libsigc++-devel
|
||||||
BuildRequires: libstdc++6-devel
|
BuildRequires: libstdc++6-devel
|
||||||
|
BuildRequires: libvisio-devel
|
||||||
|
BuildRequires: libwpg-devel
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: libxslt-devel
|
BuildRequires: libxslt-devel
|
||||||
BuildRequires: libz-devel
|
BuildRequires: libz-devel
|
||||||
BuildRequires: perl-SVG
|
|
||||||
BuildRequires: perl-SVG-Parser
|
|
||||||
BuildRequires: perl-XML-XQL
|
|
||||||
BuildRequires: perl-devel
|
BuildRequires: perl-devel
|
||||||
## AUTOBUILDREQ-END
|
## AUTOBUILDREQ-END
|
||||||
BuildRequires: libMagick-devel >= 6.9.1.4-1mamba
|
BuildRequires: libMagick-devel >= 6.9.1.4-1mamba
|
||||||
@ -74,15 +79,20 @@ Additional planned work includes conversion of the codebase from C/Gtk to C++/Gt
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
#-D -T
|
||||||
|
#:<< _EOF
|
||||||
#%patch1 -p1
|
#%patch1 -p1
|
||||||
#%patch2 -p1
|
#%patch2 -p1
|
||||||
#%patch3 -p1
|
#%patch3 -p1
|
||||||
|
%patch4 -p0
|
||||||
|
%patch5 -p0
|
||||||
|
|
||||||
# Fixes build with gcc 4.8
|
# Fixes build with gcc 4.8
|
||||||
sed -e "s@commands_toolbox,@commands_toolbox@" -i src/widgets/desktop-widget.h
|
sed -e "s@commands_toolbox,@commands_toolbox@" -i src/widgets/desktop-widget.h
|
||||||
|
|
||||||
%build
|
%build
|
||||||
LDFLAGS="-ldl" \
|
LDFLAGS="-ldl" \
|
||||||
|
CXXFLAGS="--std=c++11" \
|
||||||
%configure \
|
%configure \
|
||||||
--with-gnome-vfs \
|
--with-gnome-vfs \
|
||||||
--with-python
|
--with-python
|
||||||
@ -120,6 +130,9 @@ LDFLAGS="-ldl" \
|
|||||||
%doc AUTHORS ChangeLog COPYING* NEWS README
|
%doc AUTHORS ChangeLog COPYING* NEWS README
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 13 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 0.91-3mamba
|
||||||
|
- rebuilt
|
||||||
|
|
||||||
* Thu Jun 11 2015 Automatic Build System <autodist@mambasoft.it> 0.91-2mamba
|
* Thu Jun 11 2015 Automatic Build System <autodist@mambasoft.it> 0.91-2mamba
|
||||||
- rebuilt by autoport with build requirements: libMagick-devel>=6.9.1.4-1mamba
|
- rebuilt by autoport with build requirements: libMagick-devel>=6.9.1.4-1mamba
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user