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

Merge pull request #8469 from suvari/master

Browse Source 
gtk3 with autotools
This commit is contained in:
Kamil ATLI
2020-05-01 22:01:05 +03:00
committed by GitHub
parent 382a96fc52 67d672e17e
commit fd0ef4d6fb
2 changed files with 70 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/gtk/gtk3/actions.py
+12 -18
View File
@@ -7,17 +7,15 @@
from pisi.actionsapi import get from pisi.actionsapi import get
from pisi.actionsapi import autotools from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import mesontools
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
def setup(): def setup():
options = "--prefix=/usr \ options = "--prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
-Dcolord=no \ --enable-x11-backend \
-Dgtk_doc=true \ --enable-broadway-backend \
-Dwayland_backend=false \ --disable-wayland-backend \
-Dbroadway_backend=true \
" "
shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer","")) shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer",""))
@@ -26,9 +24,7 @@ def setup():
options += " --libdir=/usr/lib32 \ options += " --libdir=/usr/lib32 \
--bindir=/usr/bin32 \ --bindir=/usr/bin32 \
--sbindir=/usr/sbin32 \ --sbindir=/usr/sbin32 \
-Dman=false \ --enable-colord=no \
-Dgtk_doc=false \
-Dcolord=no \
" "
shelltools.export("CC", "%s -m32" % get.CC()) shelltools.export("CC", "%s -m32" % get.CC())
@@ -40,21 +36,19 @@ def setup():
pisitools.dosed("configure.ac", "cups-config", "cups-config-32bit") pisitools.dosed("configure.ac", "cups-config", "cups-config-32bit")
#autotools.autoreconf("-fiv") autotools.autoreconf("-fiv")
mesontools.configure(options) autotools.configure(options)
#pisitools.dosed("libtool", "( -shared )", r" -Wl,-O1,--as-needed\1") pisitools.dosed("libtool", "( -shared )", r" -Wl,-O1,--as-needed\1")
def build(): def build():
mesontools.build() autotools.make()
#autotools.make()
def install(): def install():
mesontools.install() autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#autotools.rawInstall("DESTDIR=%s" % get.installDIR())
# remove empty dir # remove empty dir
#pisitools.removeDir("/usr/share/man") pisitools.removeDir("/usr/share/man")
pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*") pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*")
if get.buildTYPE() == "emul32": if get.buildTYPE() == "emul32":
desktop/toolkit/gtk/gtk3/pspec.xml
+11 -13
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" ?> <?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> <PISI>
<Source> <Source>
<Name>gtk3</Name> <Name>gtk3</Name>
@@ -11,9 +11,8 @@
<License>LGPLv2.1</License> <License>LGPLv2.1</License>
<Summary>The GIMP Toolkit version 3</Summary> <Summary>The GIMP Toolkit version 3</Summary>
<Description>GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites.</Description> <Description>GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites.</Description>
<Archive sha1sum="f718433c09f77227fd3a10cbf31249f2ceea5a22" type="tarxz">mirrors://gnome/gtk+/3.24/gtk+-3.24.18.tar.xz</Archive> <Archive sha1sum="56b853392d4198326dfc6b6104edccb757b8e94b" type="tarxz">mirrors://gnome/gtk+/3.24/gtk+-3.24.20.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>atk-devel</Dependency> <Dependency>atk-devel</Dependency>
<Dependency>cups-devel</Dependency> <!--It was disabled to avoid circle--> <Dependency>cups-devel</Dependency> <!--It was disabled to avoid circle-->
<Dependency>at-spi2-atk-devel</Dependency> <Dependency>at-spi2-atk-devel</Dependency>
@@ -40,8 +39,8 @@
<!--Dependency>librest-devel</Dependency>--> <!--Dependency>librest-devel</Dependency>-->
<Dependency>fribidi-devel</Dependency> <Dependency>fribidi-devel</Dependency>
<Dependency>harfbuzz-devel</Dependency> <Dependency>harfbuzz-devel</Dependency>
<Dependency>libxkbcommon-devel</Dependency> <Dependency>iso-codes-devel</Dependency>
<Dependency>docbook-xsl</Dependency> <Dependency>sassc</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- <Patch level="1">071_fix-installation-of-HTML-images.patch</Patch> --> <!-- <Patch level="1">071_fix-installation-of-HTML-images.patch</Patch> -->
@@ -82,7 +81,6 @@
<Dependency>fribidi</Dependency> <Dependency>fribidi</Dependency>
<Dependency>freetype</Dependency> <Dependency>freetype</Dependency>
<Dependency>harfbuzz</Dependency> <Dependency>harfbuzz</Dependency>
<Dependency>libxkbcommon</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="config">/etc</Path> <Path fileType="config">/etc</Path>
@@ -220,14 +218,14 @@
</Package>--> </Package>-->
<History> <History>
<Update release="133"> <Update release="13">
<Date>2020-04-12</Date> <Date>2020-05-01</Date>
<Version>3.24.18</Version> <Version>3.24.20</Version>
<Comment>Version bump.</Comment> <Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name> <Name>Kamil Atlı</Name>
<Email>muscnsl@gmail.com</Email> <Email>suvari@pisilinux.org</Email>
</Update> </Update>
<Update release="12"> <Update release="12">
<Date>2020-01-10</Date> <Date>2020-01-10</Date>
<Version>3.24.13</Version> <Version>3.24.13</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>