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

Merge pull request #1009 from IdrisKalp/master

Browse Source 
glib2
This commit is contained in:
Idris Kalp
2019-12-22 19:43:05 +03:00
committed by GitHub
parent aabbbc30eb d41a3ccf3e
commit cf9514f27c
10 changed files with 113 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/docbook/docbook-xsl/pspec.xml
+7
View File
@@ -41,6 +41,13 @@
</Package>
<History>
<Update release="6">
<Date>2019-10-03</Date>
<Version>1.79.1</Version>
<Comment>Release bump</Comment>
<Name>idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="5">
<Date>2019-01-13</Date>
<Version>1.79.1</Version>
office/docbook/sgml-common/pspec.xml
+7
View File
@@ -34,6 +34,13 @@
</Package>
<History>
<Update release="5">
<Date>2019-10-03</Date>
<Version>0.6.3</Version>
<Comment>Release bump</Comment>
<Name>idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-07-23</Date>
<Version>0.6.3</Version>
system/base/glib2/actions.py
+30 -18
View File
@@ -9,43 +9,55 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import get
from pisi.actionsapi import shelltools
builddir = "build32" if get.buildTYPE() == 'emul32' else "build"
def setup():
options = "--with-pcre=system \
--disable-fam \
--disable-libelf \
--enable-gtk-doc=no \
--disable-libmount \
--disable-static \
--enable-shared \
--disable-man \
--enable-systemtap"
options = "-Dselinux=disabled \
-Dman=true \
-Dgtk_doc=false"
if get.buildTYPE() == "_emul32":
options += " --libdir=/usr/lib32 \
options += " --libdir=/_emul32/lib32 \
--bindir=/_emul32/bin \
--sbindir=/_emul32/sbin \
--disable-dtrace"
--prefix=/_emul32 \
-Dlibmount=false"
shelltools.export("CC", "%s -m32" % get.CC())
shelltools.export("CXX", "%s -m32" % get.CXX())
shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
shelltools.system("patch -p1 < multilib.diff")
else :
options += " --libdir=/usr/lib \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
--datadir=/usr/share \
--prefix=/usr"
#autotools.autoreconf("-vif")
autotools.configure(options)
shelltools.makedirs("%s" %builddir)
shelltools.cd("%s" %builddir)
shelltools.system("meson .. %s" % options)
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
#pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
autotools.make("-j1")
#autotools.make("-j1")
shelltools.cd("%s" %builddir)
shelltools.system("ninja")
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
shelltools.cd("%s" %builddir)
#autotools.rawInstall("DESTDIR=%s" % get.installDIR())
shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
if get.buildTYPE() == "_emul32":
pisitools.domove("/_emul32/bin/gio-querymodules", "/usr/bin/32/")
pisitools.domove("/_emul32/lib32", "/usr")
pisitools.removeDir("/_emul32")
pisitools.removeDir("/usr/share/gdb")
pisitools.dodoc("AUTHORS", "ChangeLog", "README", "NEWS")
if get.buildTYPE() != "_emul32":
pisitools.removeDir("/usr/share/gdb")
shelltools.cd("..")
pisitools.dodoc("AUTHORS", "COPYING", "README*")
system/base/glib2/files/multilib.diff
+12
View File
@@ -0,0 +1,12 @@
diff --git i/gio/tests/meson.build w/gio/tests/meson.build
index 65f43e267..3bd66bf60 100644
--- i/gio/tests/meson.build
+++ w/gio/tests/meson.build
@@ -598,6 +598,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
'-r',
'-b','binary',
'@INPUT@',
+ '--oformat', 'elf32-i386',
'-o','@OUTPUT@'])
# Rename symbol to match the one in the C file
system/base/glib2/files/noisy-glib-compile-schemas.diff
+24
View File
@@ -0,0 +1,24 @@
diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c
index b8de0907248f6860..130f89b1728f7932 100644
--- i/gio/glib-compile-schemas.c
+++ w/gio/glib-compile-schemas.c
@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state,
return;
}
- if (path && (g_str_has_prefix (path, "/apps/") ||
- g_str_has_prefix (path, "/desktop/") ||
- g_str_has_prefix (path, "/system/")))
- {
- gchar *message = NULL;
- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. "
- "Paths starting with "
- "“/apps/”, “/desktop/” or “/system/” are deprecated."),
- id, path);
- g_printerr ("%s\n", message);
- g_free (message);
- }
-
state->schema_state = schema_state_new (path, gettext_domain,
extends, extends_name, list_of);
system/base/glib2/pspec.xml
+24 -6
View File
@@ -12,16 +12,22 @@
<IsA>library</IsA>
<Summary>A library of handy utility functions</Summary>
<Description>glib2 is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system.</Description>
<Archive sha1sum="12d7466550156ac8a765f603b0df7604cdf34cfd" type="tarxz">mirrors://gnome/glib/2.54/glib-2.54.3.tar.xz</Archive>
<Archive sha1sum="f9a493c86f98482f13c6ed742c19487e6fa8f34b" type="tarxz">mirrors://gnome/glib/2.62/glib-2.62.4.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="8.36">libpcre-devel</Dependency>
<Dependency versionFrom="8.43">libpcre-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>libffi-devel</Dependency>
<Dependency>libutil-linux-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>meson</Dependency>
<Dependency>ninja</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">deprecated-no-warn.patch</Patch>
<Patch>glib-2.54.3-skip_warnings-1.patch</Patch>
<Patch level="1">noisy-glib-compile-schemas.diff</Patch>
</Patches>
<AdditionalFiles>
<AdditionalFile target="multilib.diff" permission="0644">multilib.diff</AdditionalFile>
</AdditionalFiles>
</Source>
<Package>
@@ -30,7 +36,9 @@
<Dependency>libpcre</Dependency>
<Dependency>zlib</Dependency>
<!--<Dependency>elfutils</Dependency>-->
<Dependency>libffi</Dependency>
<Dependency>libffi</Dependency>
<Dependency>elfutils</Dependency>
<Dependency>libutil-linux</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/etc/profile.d</Path>
@@ -60,7 +68,10 @@
<Summary>Development files for glib2</Summary>
<RuntimeDependencies>
<Dependency release="current">glib2</Dependency>
<Dependency>libpcre-devel</Dependency>
<Dependency>libpcre-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>libffi-devel</Dependency>
<Dependency>libutil-linux-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/gtester</Path>
@@ -126,6 +137,13 @@
</Package>
<History>
<Update release="8">
<Date>2019-12-22</Date>
<Version>2.62.4</Version>
<Comment>Version bump</Comment>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="7">
<Date>2019-04-05</Date>
<Version>2.54.3</Version>
system/base/libffi/actions.py
+5 -4
View File
@@ -23,13 +23,14 @@ def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
if get.buildTYPE() == "emul32":
# Remove duplicated header files
#if get.buildTYPE() == "emul32":
## Remove duplicated header files
#pisitools.removeDir("/usr/lib32/%s" % get.srcDIR())
# Fix emul32 includedir
## Fix emul32 includedir
#pisitools.dosym("/usr/lib/%s/include" % get.srcDIR(),
#"/usr/lib32/%s/include" % get.srcDIR())
return
pisitools.dodoc("ChangeLog*", "LICENSE", "README*")
system/base/libffi/pspec.xml
+1 -3
View File
@@ -31,9 +31,7 @@
<Dependency release="current">libffi</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/lib/libffi-*</Path>
<Path fileType="header">/usr/include/ffitarget.h</Path>
<Path fileType="header">/usr/include/ffi.h</Path>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/lib32/pkgconfig</Path>
<Path fileType="info">/usr/share/info</Path>
system/base/xz/actions.py
+2 -1
View File
@@ -16,9 +16,10 @@ def setup():
# Remove RPATH
pisitools.dosed("libtool", "^hardcode_libdir_flag_spec=.*", "hardcode_libdir_flag_spec=\"\"")
pisitools.dosed("libtool", "^runpath_var=LD_RUN_PATH", "runpath_var=DIE_RPATH_DIE")
shelltools.export("LDFLAGS", "-lpthread")
def build():
shelltools.export("LDFLAGS", "-lpthread")
autotools.make()
def check():
system/base/xz/pspec.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<Patches>
<Patch level="1">0002-xz-Fix-an-integer-overflow-with-32-bit-off_t.patch</Patch>
<Patch level="1">0001-liblzma-Avoid-memcpy-NULL-foo-0-because-it-is-undefi.patch</Patch>
<Patch level="1">pthread.patch</Patch>
<!-- <Patch level="1">pthread.patch</Patch> -->
</Patches>
</Source>