Merge branch '4fury-c3440d8/master'
This commit is contained in:
@@ -1,33 +1,33 @@
|
||||
#!/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
|
||||
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
i = ''.join([
|
||||
' --prefix=/usr',
|
||||
' --disable-werror',
|
||||
' --disable-static',
|
||||
' --without-docs',
|
||||
' --with-mdds=2.1 '
|
||||
])
|
||||
|
||||
def setup():
|
||||
# pisitools.cxxflags.add("-std=gnu++11")
|
||||
shelltools.system("./autogen.sh")
|
||||
autotools.autoreconf("-fi")
|
||||
autotools.configure("--prefix=/usr \
|
||||
--disable-werror \
|
||||
--without-docs \
|
||||
--enable-static=no \
|
||||
--with-mdds=2.1")
|
||||
autotools.configure(i)
|
||||
|
||||
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
#def check():
|
||||
#autotools.make("check")
|
||||
def check():
|
||||
autotools.make("check")
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README", "FEATURES")
|
||||
pisitools.dodoc("AUTHORS", "COPYING")
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
--- libetonyek-0.1.6/configure.ac
|
||||
+++ libetonyek-0.1.6/configure.ac
|
||||
@@ -24,8 +24,8 @@ AC_LANG([C++])
|
||||
# Configure options
|
||||
# =================
|
||||
AC_ARG_WITH([mdds],
|
||||
- AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
|
||||
- [], [with_mdds="1.0"])
|
||||
+ AS_HELP_STRING([--with-mdds=1.2|0.x], [Specify which version of mdds to use (1.2 is the default)]),
|
||||
+ [], [with_mdds="1.2"])
|
||||
|
||||
# ===========================
|
||||
# Find required base packages
|
||||
@@ -47,7 +47,7 @@ AC_PROG_SED
|
||||
|
||||
AM_MISSING_PROG([GPERF], [gperf])
|
||||
|
||||
-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
|
||||
+AS_IF([test "$with_mdds" != "0.x"], [AX_CXX_COMPILE_STDCXX_11([noext])])
|
||||
|
||||
# ===============
|
||||
# Find librevenge
|
||||
@@ -138,8 +138,8 @@ AC_SUBST([GLM_CFLAGS])
|
||||
# =========
|
||||
# Find mdds
|
||||
# =========
|
||||
-AS_IF([test "$with_mdds" = "1.0"], [
|
||||
- PKG_CHECK_MODULES([MDDS], [mdds-1.0])
|
||||
+AS_IF([test "$with_mdds" != "0.x"], [
|
||||
+ PKG_CHECK_MODULES([MDDS], [mdds-][$with_mdds])
|
||||
], [
|
||||
PKG_CHECK_MODULES([MDDS], [mdds])
|
||||
AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
|
||||
@@ -1,11 +0,0 @@
|
||||
diff -Nru libetonyek-0.1.9.orig/src/lib/NUM3Parser.cpp libetonyek-0.1.9/src/lib/NUM3Parser.cpp
|
||||
--- libetonyek-0.1.9.orig/src/lib/NUM3Parser.cpp 2018-12-28 20:45:35.000000000 +0300
|
||||
+++ libetonyek-0.1.9/src/lib/NUM3Parser.cpp 2021-03-10 19:02:13.203978181 +0300
|
||||
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
#include <functional>
|
||||
+#include <algorithm>
|
||||
|
||||
#include "NUM3Parser.h"
|
||||
|
||||
@@ -1,33 +1,33 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>libetonyek</Name>
|
||||
<Homepage>http://www.freedesktop.org/wiki/Software/libetonyek/</Homepage>
|
||||
<Homepage>https://wiki.documentfoundation.org/DLP/Libraries/libetonyek</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>MPL-1.0</License>
|
||||
<License>MPL-2</License>
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>A library for import of Apple Keynote presentations</Summary>
|
||||
<Description>Libetonyek is library providing ability to interpret and import Apple Keynote presentations into various applications. You can find it being used in libreoffice.</Description>
|
||||
<Summary>The Apple iWork documents toolchain.</Summary>
|
||||
<Description>libetonyek library and a set of tools for reading and converting Apple iWork documents (Keynote, Numbers and Pages).</Description>
|
||||
<Archive sha1sum="45e99328babedfa5514e30573c49a1698c5b5b2a" type="tarxz">https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.12.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>doxygen</Dependency>
|
||||
<Dependency>zlib-devel</Dependency>
|
||||
<Dependency>libxml2-devel</Dependency>
|
||||
<Dependency>boost-devel</Dependency>
|
||||
<Dependency>cppunit-devel</Dependency>
|
||||
<Dependency>librevenge-devel</Dependency>
|
||||
<Dependency>glm</Dependency>
|
||||
<Dependency>gperf</Dependency>
|
||||
<Dependency>doxygen</Dependency>
|
||||
<Dependency>zlib-devel</Dependency>
|
||||
<Dependency>mdds-devel</Dependency>
|
||||
<Dependency>boost-devel</Dependency>
|
||||
<Dependency>libxml2-devel</Dependency>
|
||||
<Dependency>cppunit-devel</Dependency>
|
||||
<Dependency>librevenge-devel</Dependency>
|
||||
<Dependency>liblangtag-devel</Dependency>
|
||||
<Dependency versionFrom="2.0.1">mdds-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Archive sha1sum="d0dc3fac41b56edaf3ac528ec274aa07357f989b" type="tarxz">https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.10.tar.xz</Archive>
|
||||
<!-- <Patches>
|
||||
<Patch level="1">libetonyek-build-fix.patch</Patch>
|
||||
</Patches>-->
|
||||
<Patches>
|
||||
<!-- <Patch level="1"></Patch> -->
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -57,13 +57,19 @@
|
||||
<Dependency release="current">libetonyek</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="library">/usr/lib/pkgconfig</Path>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="10">
|
||||
<Date>2025-02-09</Date>
|
||||
<Version>0.1.12</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="9">
|
||||
<Date>2023-10-29</Date>
|
||||
<Version>0.1.10</Version>
|
||||
|
||||
@@ -4,16 +4,21 @@
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
|
||||
|
||||
from pisi.actionsapi import cmaketools, pisitools, get
|
||||
from pisi.actionsapi import cmaketools, mesontools, pisitools
|
||||
|
||||
i = ''.join([
|
||||
' -DCMAKE_INSTALL_PREFIX=/usr',
|
||||
' -DCMAKE_BUILD_TYPE=Release',
|
||||
' -Bbuild -G Ninja -L '
|
||||
])
|
||||
|
||||
def setup():
|
||||
cmaketools.configure("-B_build -DCMAKE_BUILD_TYPE=Release")
|
||||
cmaketools.configure(i)
|
||||
|
||||
def build():
|
||||
cmaketools.make("-C _build")
|
||||
cmaketools.make("-C _build translations")
|
||||
mesontools.build()
|
||||
|
||||
def install():
|
||||
cmaketools.install("-C _build install")
|
||||
mesontools.install()
|
||||
|
||||
pisitools.dodoc("AUTHORS", "CHANGELOG.md")
|
||||
pisitools.dodoc("AUTHORS", "copyright.txt", "LICENSE")
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
https://bugs.gentoo.org/894720
|
||||
https://bugs.gentoo.org/895536
|
||||
--- a/src/view/background/BackgroundConfig.h
|
||||
+++ b/src/view/background/BackgroundConfig.h
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
@@ -1,100 +1,105 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>xournalpp</Name>
|
||||
<Homepage>https://github.com/xournalpp/xournalpp</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPLv2</License>
|
||||
<IsA>app:gui</IsA>
|
||||
<PartOf>office.misc</PartOf>
|
||||
<Summary>Xournal++ is a handwriting notetaking software with PDF annotation support.</Summary>
|
||||
<Description>
|
||||
Xournal++ is a handwriting notetaking software with PDF annotation support. Written in C++ with GTK3, supporting Linux, macOS and Windows 10. Supports pen input from devices such as Wacom Tablets.
|
||||
</Description>
|
||||
<Archive sha1sum="a0182f5fd4742d600849bf3d2aefc9c62d2a8538" type="targz">
|
||||
https://github.com/xournalpp/xournalpp/archive/refs/tags/v1.1.3.tar.gz
|
||||
</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>git</Dependency>
|
||||
<Dependency>cmake</Dependency>
|
||||
<Dependency>lua-devel</Dependency>
|
||||
<Dependency>gtk3-devel</Dependency>
|
||||
<Dependency>util-linux</Dependency>
|
||||
<Dependency>lsb-release</Dependency>
|
||||
<Dependency>libzip-devel</Dependency>
|
||||
<Dependency>libxml2-devel</Dependency>
|
||||
<Dependency>librsvg-devel</Dependency>
|
||||
<Dependency>portaudio-devel</Dependency>
|
||||
<Dependency>libsndfile-devel</Dependency>
|
||||
<Dependency>poppler-glib-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">xournalpp-1.1.3-gcc13.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
<Source>
|
||||
<Name>xournalpp</Name>
|
||||
<Homepage>https://github.com/xournalpp/xournalpp</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPLv2</License>
|
||||
<IsA>app:gui</IsA>
|
||||
<PartOf>office.misc</PartOf>
|
||||
<Summary>Xournal++ is a handwriting notetaking software with PDF annotation support.</Summary>
|
||||
<Description>Xournal++ is a handwriting notetaking software with PDF annotation support. Written in C++ with GTK3. Supports pen input from devices such as Wacom Tablets.</Description>
|
||||
<Archive sha1sum="d50817f9c75ca034ba516291b26ebe49eed62bfc" type="targz">https://github.com/xournalpp/xournalpp/archive/v1.2.6/xournalpp-1.2.6.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>cmake</Dependency>
|
||||
<Dependency>ninja</Dependency>
|
||||
<Dependency>lua-devel</Dependency>
|
||||
<Dependency>gtk3-devel</Dependency>
|
||||
<Dependency>util-linux</Dependency>
|
||||
<Dependency>lsb-release</Dependency>
|
||||
<Dependency>libzip-devel</Dependency>
|
||||
<Dependency>libxml2-devel</Dependency>
|
||||
<Dependency>librsvg-devel</Dependency>
|
||||
<Dependency>portaudio-devel</Dependency>
|
||||
<Dependency>libsndfile-devel</Dependency>
|
||||
<Dependency>poppler-glib-devel</Dependency>
|
||||
<Dependency>gtksourceview4-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- <Patch level="1"></Patch> -->
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>xournalpp</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>lua</Dependency>
|
||||
<Dependency>gtk3</Dependency>
|
||||
<Dependency>zlib</Dependency>
|
||||
<Dependency>cairo</Dependency>
|
||||
<Dependency>glib2</Dependency>
|
||||
<Dependency>libXi</Dependency>
|
||||
<Dependency>pango</Dependency>
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>libzip</Dependency>
|
||||
<Dependency>libxml2</Dependency>
|
||||
<Dependency>librsvg</Dependency>
|
||||
<Dependency>portaudio</Dependency>
|
||||
<Dependency>gdk-pixbuf</Dependency>
|
||||
<Dependency>libsndfile</Dependency>
|
||||
<!-- <Dependency>texlive-bin</Dependency> -->
|
||||
<!-- <Dependency>texlive-core</Dependency> -->
|
||||
<Dependency>poppler-glib</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="data">/usr/share</Path>
|
||||
<Path fileType="localedata">/usr/share/locale</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
<Package>
|
||||
<Name>xournalpp</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>lua</Dependency>
|
||||
<Dependency>gtk3</Dependency>
|
||||
<Dependency>zlib</Dependency>
|
||||
<Dependency>cairo</Dependency>
|
||||
<Dependency>glib2</Dependency>
|
||||
<Dependency>libXi</Dependency>
|
||||
<Dependency>pango</Dependency>
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>libzip</Dependency>
|
||||
<Dependency>libxml2</Dependency>
|
||||
<Dependency>librsvg</Dependency>
|
||||
<Dependency>portaudio</Dependency>
|
||||
<Dependency>gdk-pixbuf</Dependency>
|
||||
<Dependency>libsndfile</Dependency>
|
||||
<!-- <Dependency>texlive-bin</Dependency> -->
|
||||
<!-- <Dependency>texlive-core</Dependency> -->
|
||||
<Dependency>poppler-glib</Dependency>
|
||||
<Dependency>gtksourceview4</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="data">/usr/share</Path>
|
||||
<Path fileType="localedata">/usr/share/locale</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="4">
|
||||
<Date>2023-01-04</Date>
|
||||
<Version>1.1.3</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>fury</Name>
|
||||
<Email>uglyside@yandex.ru</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2022-04-14</Date>
|
||||
<Version>1.1.1</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>fury</Name>
|
||||
<Email>uglyside@yandex.ru</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2021-07-21</Date>
|
||||
<Version>1.1.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>fury</Name>
|
||||
<Email>uglyside@yandex.ru</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2021-03-05</Date>
|
||||
<Version>1.0.20</Version>
|
||||
<Comment>First build</Comment>
|
||||
<Name>fury</Name>
|
||||
<Email>uglyside@yandex.ru</Email>
|
||||
</Update>
|
||||
</History>
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2025-02-25</Date>
|
||||
<Version>1.2.6</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvari@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2023-01-04</Date>
|
||||
<Version>1.1.3</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>fury</Name>
|
||||
<Email>uglyside@yandex.ru</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2022-04-14</Date>
|
||||
<Version>1.1.1</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>fury</Name>
|
||||
<Email>uglyside@yandex.ru</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2021-07-21</Date>
|
||||
<Version>1.1.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>fury</Name>
|
||||
<Email>uglyside@yandex.ru</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2021-03-05</Date>
|
||||
<Version>1.0.20</Version>
|
||||
<Comment>First build</Comment>
|
||||
<Name>fury</Name>
|
||||
<Email>uglyside@yandex.ru</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
|
||||
Reference in New Issue
Block a user