Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6943 from Rmys/master

Browse Source 
inkscape:rebuild cmake build
This commit is contained in:
Rmys
2019-06-26 11:49:45 +03:00
committed by GitHub
parent 5f4342a116 434565fc08
commit e92a2dc860
4 changed files with 205 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/graphics/inkscape/actions.py
+24 -32
View File
@@ -1,32 +1,24 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
from pisi.actionsapi import shelltools
def setup():
shelltools.system("./autogen.sh")
autotools.configure(" \
--enable-lcms \
--disable-static \
--enable-poppler-cairo \
--disable-dependency-tracking \
--without-gnome-vfs \
--without-inkjar \
--enable-dbusapi \
--enable-nls")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("AUTHORS", "COPYING", "ChangeLog", "NEWS", "README")
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import pisitools
from pisi.actionsapi import cmaketools
from pisi.actionsapi import get
def setup():
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_DBUS=ON \
-DCMAKE_BUILD_TYPE=Release")
def build():
cmaketools.make()
def install():
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.remove("/usr/lib/inkscape/*.a")
pisitools.dodoc("AUTHORS", "COPYING", "ChangeLog", "NEWS", "README")
multimedia/graphics/inkscape/files/im7.patch
+106
View File
@@ -0,0 +1,106 @@
diff -Naur orig/src/extension/CMakeLists.txt patched/src/extension/CMakeLists.txt
--- orig/src/extension/CMakeLists.txt 2017-03-24 00:51:36.134741323 +0100
+++ patched/src/extension/CMakeLists.txt 2017-03-24 04:14:34.510756391 +0100
@@ -218,8 +218,8 @@
internal/bitmap/normalize.h
internal/bitmap/oilPaint.cpp
internal/bitmap/oilPaint.h
- internal/bitmap/opacity.cpp
- internal/bitmap/opacity.h
+# internal/bitmap/opacity.cpp
+# internal/bitmap/opacity.h
internal/bitmap/raise.cpp
internal/bitmap/raise.h
internal/bitmap/reduceNoise.cpp
diff -Naur orig/src/extension/init.cpp patched/src/extension/init.cpp
--- orig/src/extension/init.cpp 2017-03-24 00:51:36.134741323 +0100
+++ patched/src/extension/init.cpp 2017-03-24 13:12:39.709882011 +0100
@@ -88,7 +88,7 @@
#include "internal/bitmap/negate.h"
#include "internal/bitmap/normalize.h"
#include "internal/bitmap/oilPaint.h"
-#include "internal/bitmap/opacity.h"
+//#include "internal/bitmap/opacity.h"
#include "internal/bitmap/raise.h"
#include "internal/bitmap/reduceNoise.h"
#include "internal/bitmap/sample.h"
@@ -224,7 +224,7 @@
Internal::Bitmap::Negate::init();
Internal::Bitmap::Normalize::init();
Internal::Bitmap::OilPaint::init();
- Internal::Bitmap::Opacity::init();
+// Internal::Bitmap::Opacity::init();
Internal::Bitmap::Raise::init();
Internal::Bitmap::ReduceNoise::init();
Internal::Bitmap::Sample::init();
diff -Naur orig/src/extension/internal/bitmap/channel.cpp patched/src/extension/internal/bitmap/channel.cpp
--- orig/src/extension/internal/bitmap/channel.cpp 2017-03-24 00:51:36.134741323 +0100
+++ patched/src/extension/internal/bitmap/channel.cpp 2017-03-24 03:06:36.164250664 +0100
@@ -28,7 +28,7 @@
else if (!strcmp(_layerName, "Yellow Channel")) layer = Magick::YellowChannel;
else if (!strcmp(_layerName, "Black Channel")) layer = Magick::BlackChannel;
else if (!strcmp(_layerName, "Opacity Channel")) layer = Magick::OpacityChannel;
- else if (!strcmp(_layerName, "Matte Channel")) layer = Magick::MatteChannel;
+ else if (!strcmp(_layerName, "Alpha Channel")) layer = Magick::AlphaChannel;
image->channel(layer);
}
@@ -56,7 +56,7 @@
"<_item value='Yellow Channel'>" N_("Yellow Channel") "</_item>\n"
"<_item value='Black Channel'>" N_("Black Channel") "</_item>\n"
"<_item value='Opacity Channel'>" N_("Opacity Channel") "</_item>\n"
- "<_item value='Matte Channel'>" N_("Matte Channel") "</_item>\n"
+ "<_item value='Alpha Channel'>" N_("Alpha Channel") "</_item>\n"
"</param>\n"
"<effect>\n"
"<object-type>all</object-type>\n"
diff -Naur orig/src/extension/internal/bitmap/crop.cpp patched/src/extension/internal/bitmap/crop.cpp
--- orig/src/extension/internal/bitmap/crop.cpp 2017-03-24 00:51:36.134741323 +0100
+++ patched/src/extension/internal/bitmap/crop.cpp 2017-03-24 02:31:09.915343848 +0100
@@ -24,7 +24,7 @@
int width = image->baseColumns() - (_left + _right);
int height = image->baseRows() - (_top + _bottom);
if (width > 0 and height > 0) {
- image->crop(Magick::Geometry(width, height, _left, _top, false, false));
+ image->crop(Magick::Geometry(width, height, _left, _top));
image->page("+0+0");
}
}
diff -Naur orig/src/extension/internal/bitmap/levelChannel.cpp patched/src/extension/internal/bitmap/levelChannel.cpp
--- orig/src/extension/internal/bitmap/levelChannel.cpp 2017-03-24 00:51:36.134741323 +0100
+++ patched/src/extension/internal/bitmap/levelChannel.cpp 2017-03-24 03:45:35.902823802 +0100
@@ -28,9 +28,9 @@
else if (!strcmp(_channelName, "Yellow Channel")) channel = Magick::YellowChannel;
else if (!strcmp(_channelName, "Black Channel")) channel = Magick::BlackChannel;
else if (!strcmp(_channelName, "Opacity Channel")) channel = Magick::OpacityChannel;
- else if (!strcmp(_channelName, "Matte Channel")) channel = Magick::MatteChannel;
- Magick::Quantum black_point = Magick::Color::scaleDoubleToQuantum(_black_point / 100.0);
- Magick::Quantum white_point = Magick::Color::scaleDoubleToQuantum(_white_point / 100.0);
+ else if (!strcmp(_channelName, "Alpha Channel")) channel = Magick::AlphaChannel;
+ Magick::Quantum black_point = static_cast<Magick::Quantum>(_black_point / 100.0);
+ Magick::Quantum white_point = static_cast<Magick::Quantum>(_white_point / 100.0);
image->levelChannel(channel, black_point, white_point, _mid_point);
}
@@ -60,7 +60,7 @@
"<_item value='Yellow Channel'>" N_("Yellow Channel") "</_item>\n"
"<_item value='Black Channel'>" N_("Black Channel") "</_item>\n"
"<_item value='Opacity Channel'>" N_("Opacity Channel") "</_item>\n"
- "<_item value='Matte Channel'>" N_("Matte Channel") "</_item>\n"
+ "<_item value='Alpha Channel'>" N_("Alpha Channel") "</_item>\n"
"</param>\n"
"<param name=\"blackPoint\" _gui-text=\"" N_("Black Point:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">0.0</param>\n"
"<param name=\"whitePoint\" _gui-text=\"" N_("White Point:") "\" type=\"float\" min=\"0.0\" max=\"100.0\">100.0</param>\n"
diff -Naur orig/src/extension/internal/bitmap/level.cpp patched/src/extension/internal/bitmap/level.cpp
--- orig/src/extension/internal/bitmap/level.cpp 2017-03-24 00:51:36.134741323 +0100
+++ patched/src/extension/internal/bitmap/level.cpp 2017-03-24 03:45:33.306793000 +0100
@@ -19,8 +19,8 @@
void
Level::applyEffect(Magick::Image* image) {
- Magick::Quantum black_point = Magick::Color::scaleDoubleToQuantum(_black_point / 100.0);
- Magick::Quantum white_point = Magick::Color::scaleDoubleToQuantum(_white_point / 100.0);
+ Magick::Quantum black_point = static_cast<Magick::Quantum>(_black_point / 100.0);
+ Magick::Quantum white_point = static_cast<Magick::Quantum>(_white_point / 100.0);
image->level(black_point, white_point, _mid_point);
}
multimedia/graphics/inkscape/files/inkscape-poppler-0.72.patch
+65
View File
@@ -0,0 +1,65 @@
diff -up ./src/extension/internal/pdfinput/pdf-input.cpp.orig ./src/extension/internal/pdfinput/pdf-input.cpp
--- ./src/extension/internal/pdfinput/pdf-input.cpp.orig 2018-12-08 20:29:53.411394981 +0200
+++ ./src/extension/internal/pdfinput/pdf-input.cpp 2018-12-08 20:32:35.675968747 +0200
@@ -319,7 +319,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc
_render_thumb = true;
// Create PopplerDocument
- Glib::ustring filename = _pdf_doc->getFileName()->getCString();
+ Glib::ustring filename = _pdf_doc->getFileName()->c_str();
if (!Glib::path_is_absolute(filename)) {
filename = Glib::build_filename(Glib::get_current_dir(),filename);
}
diff -up ./src/extension/internal/pdfinput/pdf-parser.cpp.orig ./src/extension/internal/pdfinput/pdf-parser.cpp
--- ./src/extension/internal/pdfinput/pdf-parser.cpp.orig 2018-12-08 20:29:53.414394969 +0200
+++ ./src/extension/internal/pdfinput/pdf-parser.cpp 2018-12-08 20:32:35.683968735 +0200
@@ -2381,8 +2381,8 @@ void PdfParser::opSetFont(Object args[],
}
if (printCommands) {
printf(" font: tag=%s name='%s' %g\n",
- font->getTag()->getCString(),
- font->getName() ? font->getName()->getCString() : "???",
+ font->getTag()->c_str(),
+ font->getName() ? font->getName()->c_str() : "???",
args[1].getNum());
fflush(stdout);
}
@@ -2639,7 +2639,7 @@ void PdfParser::doShowText(GooString *s)
double lineX = state->getLineX();
double lineY = state->getLineY();
oldParser = parser;
- p = s->getCString();
+ p = s->c_str();
len = s->getLength();
while (len > 0) {
n = font->getNextChar(p, len, &code,
@@ -2694,7 +2694,7 @@ void PdfParser::doShowText(GooString *s)
} else {
state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
- p = s->getCString();
+ p = s->c_str();
len = s->getLength();
while (len > 0) {
n = font->getNextChar(p, len, &code,
diff -up ./src/extension/internal/pdfinput/svg-builder.cpp.orig ./src/extension/internal/pdfinput/svg-builder.cpp
--- ./src/extension/internal/pdfinput/svg-builder.cpp.orig 2018-12-08 20:29:53.412394977 +0200
+++ ./src/extension/internal/pdfinput/svg-builder.cpp 2018-12-08 20:32:35.678968742 +0200
@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *st
GfxFont *font = state->getFont();
// Store original name
if (font->getName()) {
- _font_specification = font->getName()->getCString();
+ _font_specification = font->getName()->c_str();
} else {
_font_specification = "Arial";
}
@@ -1047,7 +1047,7 @@ void SvgBuilder::updateFont(GfxState *st
// Font family
if (font->getFamily()) { // if font family is explicitly given use it.
- sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->getCString());
+ sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->c_str());
} else {
int attr_value = 1;
sp_repr_get_int(_preferences, "localFonts", &attr_value);
multimedia/graphics/inkscape/pspec.xml
+10 -6
View File
@@ -15,6 +15,7 @@
<Description>Inkscape is an application to create, edit, and convert SVG vector graphics images that can also import from and export to bitmap image files.</Description>
<Archive sha1sum="5dfabeab9f6925bf098b5eeba2fe2c82e36927cc" type="tarbz2">https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.4.tar.bz2</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>gtkmm-devel</Dependency>
<Dependency>atkmm-devel</Dependency>
@@ -64,10 +65,12 @@
<Dependency>gettext-devel</Dependency>
<Dependency>pkgconfig</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>desktop-file-utils</Dependency>
</BuildDependencies>
<!--<Patches>
<Patch>ime-placement.patch</Patch>
</Patches>-->
<Patches>
<Patch level="1">im7.patch</Patch>
<Patch level="1">inkscape-poppler-0.72.patch</Patch>
</Patches>
</Source>
<Package>
@@ -121,9 +124,10 @@
<Path fileType="data">/usr/share/inkscape</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/appdata</Path>
<Path fileType="data">/usr/share/metainfo/inkscape.appdata.xml</Path>
</Files>
</Package>
<Package>
<!--Package>
<Name>inkscape-devel</Name>
<Summary>Development files for Inkscape</Summary>
<RuntimeDependencies>
@@ -135,11 +139,11 @@
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
</Package-->
<History>
<Update release="6">
<Date>2019-06-24</Date>
<Date>2019-06-26</Date>
<Version>0.92.4</Version>
<Comment>Version Bump.</Comment>
<Name>Pisi Linux Community</Name>