Kaydet (Commit) 46c8233f authored tarafından Your Name's avatar Your Name

dbus düzenlendi

üst 73c6d732
......@@ -11,9 +11,12 @@ from inary.actionsapi import shelltools
from inary.actionsapi import libtools
def setup():
options = "-with-xinput=yes \
--disable-cups\
--enable-man"
options = "--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--with-xinput=yes \
--enable-gtk-doc \
--enable-test-print-backend"
#shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer",""))
#gtk2 needs -DGTK_COMPILATION CPPFLAG when compiling itself
......@@ -45,7 +48,7 @@ def build():
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
# remove empty dir
# fix conflict with gtk3
#inarytools.removeDir("/usr/share/man")
inarytools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*")
......
Index: gtk+2.0-2.21.5/gtk/gtksettings.c
===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtksettings.c 2010-07-12 18:23:45.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtksettings.c 2010-07-22 17:55:16.033053648 +0200
@@ -310,7 +310,7 @@
g_param_spec_string ("gtk-fallback-icon-theme",
P_("Fallback Icon Theme Name"),
P_("Name of a icon theme to fall back to"),
- NULL,
+ "gnome",
GTK_PARAM_READWRITE),
NULL);
g_assert (result == PROP_FALLBACK_ICON_THEME);
commit 006d5718fa927d9d3509fca1a1c1ca6522110b57
Author: Matthias Clasen <mclasen@redhat.com>
Date: Wed May 12 15:02:02 2010 -0400
Another attempt to handle pngs changing int types
diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index 43db70a..844064a 100644
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
gchar *icc_profile_base64;
const gchar *icc_profile_title;
const gchar *icc_profile;
- gulong icc_profile_size;
+ png_uint_32 icc_profile_size;
guint32 retval;
gint compression_type;
@@ -344,7 +344,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
(png_charpp) &icc_profile_title, &compression_type,
(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
if (retval != 0) {
- icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
+ icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
gdk_pixbuf_set_option (pixbuf, "icc-profile", icc_profile_base64);
g_free (icc_profile_base64);
}
@@ -607,7 +607,7 @@ png_info_callback (png_structp png_read_ptr,
gchar *icc_profile_base64;
const gchar *icc_profile_title;
const gchar *icc_profile;
- gulong icc_profile_size;
+ png_uint_32 icc_profile_size;
guint32 retval;
gint compression_type;
@@ -679,9 +679,9 @@ png_info_callback (png_structp png_read_ptr,
/* Extract embedded ICC profile */
retval = png_get_iCCP (png_read_ptr, png_info_ptr,
(png_charpp) &icc_profile_title, &compression_type,
- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
+ (png_charpp) &icc_profile, &icc_profile_size);
if (retval != 0) {
- icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
+ icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
gdk_pixbuf_set_option (lc->pixbuf, "icc-profile", icc_profile_base64);
g_free (icc_profile_base64);
}
diff -up gtk+-2.19.1/gtk/gtkrc.c.lib64 gtk+-2.19.1/gtk/gtkrc.c
--- gtk+-2.19.1/gtk/gtkrc.c.lib64 2009-11-26 01:35:50.000000000 -0500
+++ gtk+-2.19.1/gtk/gtkrc.c 2009-11-30 20:54:21.844826383 -0500
@@ -450,7 +450,17 @@ gtk_rc_get_im_module_file (void)
if (im_module_file)
result = g_strdup (im_module_file);
else
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+ {
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST,
+ "gtk.immodules", NULL);
+ if (!g_file_test (result, G_FILE_TEST_EXISTS))
+ {
+ g_free (result);
+
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
+ "gtk.immodules", NULL);
+ }
+ }
}
return result;
[Trigger]
Type = File
Operation = Install
Operation = Upgrade
Operation = Remove
Target = usr/lib/gtk-2.0/2.10.0/immodules/*.so
[Action]
Description = Probing GTK2 input method modules...
When = PostTransaction
Exec = /usr/bin/gtk-query-immodules-2.0 --update-cache
gtk-icon-theme-name = "Adwaita"
gtk-theme-name = "Adwaita"
gtk-font-name = "DejaVuSans 10"
gtk-font-name = "Cantarell 11"
diff -ur gtk+-2.22.1.orig//gdk/Makefile.am gtk+-2.22.1/gdk/Makefile.am
--- gtk+-2.22.1.orig//gdk/Makefile.am 2010-11-15 18:49:19.000000000 +0200
+++ gtk+-2.22.1/gdk/Makefile.am 2010-12-03 00:44:17.230000183 +0200
@@ -239,7 +239,7 @@
x11/gdkx.h
GdkX11-2.0.gir: $(gdktargetlib) Gdk-2.0.gir Makefile
-GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
+GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Gdk --symbol-prefix=gdk
GdkX11_2_0_gir_INCLUDES = Gio-2.0 Gdk-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
GdkX11_2_0_gir_LIBS = $(gdktargetlib)
GdkX11_2_0_gir_FILES = $(x11_introspection_files)
Index: gtk+-2.16.5/gdk/x11/gdkxid.c
===================================================================
--- gtk+-2.16.5.orig/gdk/x11/gdkxid.c
+++ gtk+-2.16.5/gdk/x11/gdkxid.c
@@ -57,8 +57,10 @@ _gdk_xid_table_insert (GdkDisplay *displ
display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
(GEqualFunc) gdk_xid_equal);
+ /*
if (g_hash_table_lookup (display_x11->xid_ht, xid))
g_warning ("XID collision, trouble ahead");
+ */
g_hash_table_insert (display_x11->xid_ht, xid, data);
}
Index: gtk+-2.16.5/gdk/x11/gdkxid.c
===================================================================
--- gtk+-2.16.5.orig/gdk/x11/gdkxid.c
+++ gtk+-2.16.5/gdk/x11/gdkxid.c
@@ -57,8 +57,10 @@ _gdk_xid_table_insert (GdkDisplay *displ
display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
(GEqualFunc) gdk_xid_equal);
+ /*
if (g_hash_table_lookup (display_x11->xid_ht, xid))
g_warning ("XID collision, trouble ahead");
+ */
g_hash_table_insert (display_x11->xid_ht, xid, data);
}
......@@ -15,7 +15,6 @@
<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="c885ade62b06854590822c8eb906daf7dd15d90a" >http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz</Archive>
<BuildDependencies>
<!--Dependency>cups-devel</Dependency--><!--It was disabled to avoid circle-->
<Dependency>libXi-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>cairo-devel</Dependency>
......@@ -35,10 +34,6 @@
<Dependency>gtk-doc</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
</BuildDependencies>
<Patches>
<!--Patch level="1">gtk2-fixdso.patch</Patch> -->
<Patch level="1">xid-collision-debug.patch</Patch>
</Patches>
</Source>
<Package>
<Name>gtk2</Name>
......@@ -58,21 +53,21 @@
<Dependency>atk</Dependency>
<Dependency>pango</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<!--<Dependency>gtk-theme-mediterranean</Dependency>--><!--it need gtk2-engines-murrine is need gtk2 too-->
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/themes</Path>
<Path fileType="data">/usr/share/gtk-2.0</Path>
<Path fileType="data">/usr/share/libalpm</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="localedata">/usr/share/locale</Path>
</Files>
<!-- Use Clearlooks as default theme for now until native Oxygen GTK style is ready -->
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/gtk-2.0/gtkrc">gtkrc</AdditionalFile>
<AdditionalFile owner="root" permission="0755" target="/usr/share/gtk-2.0/gtkrc">gtkrc</AdditionalFile>
<AdditionalFile owner="root" permission="0755" target="/usr/share/libalpm/hooks/gtk-query-immodules-2.0.hook">gtk-query-immodules-2.0.hook</AdditionalFile>
</AdditionalFiles>
<Provides>
<SCOM script="pakhandler.py">System.PackageHandler</SCOM>
......@@ -126,7 +121,6 @@
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>cairo-32bit</Dependency>
<!--Dependency>cups-32bit</Dependency-->
<Dependency>fontconfig-32bit</Dependency>
<Dependency>pango-32bit</Dependency>
<Dependency>glib2-32bit</Dependency>
......@@ -169,6 +163,13 @@
</Files>
</Package>
<History>
<Update release="3">
<Date>2020-02-06</Date>
<Version>2.24.32</Version>
<Comment>Fix conflict.</Comment>
<Name>Ali Rıza KESKİN</Name>
<Email>parduscix@yandex.ru</Email>
</Update>
<Update release="2">
<Date>2019-04-12</Date>
<Version>2.24.32</Version>
......
......@@ -10,16 +10,30 @@ from inary.actionsapi import shelltools
from inary.actionsapi import inarytools
shelltools.export("CFLAGS","")
shelltools.export("CFLAGS","-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS")
shelltools.export("CXXFLAGS","")
shelltools.export("LDFLAGS","")
if get.buildTYPE()=="emul32":
shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
shelltools.export("PKG_CONFIG_LIBDIR","/usr/lib32/pkgconfig")
shelltools.export("PKG_CONFIG_PATH","/usr/share/pkgconfig")
def setup():
mesontools.meson_configure("-Dbroadway_backend=true -Dx11_backend=true -Dcolord=yes -Dgtk_doc=false -Dman=true")
if get.buildTYPE()!="emul32":
mesontools.meson_configure('-D broadway_backend=true \
-D colord=no \
-D demos=true \
-D examples=false \
-D tests=false \
-D installed_tests=false')
else:
mesontools.meson_configure('-D broadway_backend=true \
-D colord=no \
-D demos=false \
-D examples=false \
-D tests=false \
-D installed_tests=false')
def build():
mesontools.ninja_build()
......
[Trigger]
Type = File
Operation = Install
Operation = Upgrade
Operation = Remove
Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
[Action]
Description = Probing GTK3 input method modules...
When = PostTransaction
Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
[Settings]
gtk-icon-theme-name = Adwaita
gtk-theme-name = Adwaita
gtk-font-name = DejaVuSans 10
gtk-font-name = Cantarell 11
......@@ -80,7 +80,8 @@
<Path fileType="localedata">/usr/share/locale</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/gtk-3.0/settings.ini">settings.ini</AdditionalFile>
<AdditionalFile owner="root" permission="0755" target="/usr/share/gtk-3.0/settings.ini">settings.ini</AdditionalFile>
<AdditionalFile owner="root" permission="0755" target="/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook">gtk-query-immodules-3.0.hook</AdditionalFile>
</AdditionalFiles>
<Provides>
<SCOM script="pakhandler.py">System.PackageHandler</SCOM>
......
......@@ -11,12 +11,17 @@ from inary.actionsapi import get
def setup():
shelltools.export("PKG_CONFIG_PATH", "/usr/lib/pkgconfig")
autotools.configure("--disable-gtk-doc \
--enable-gtk3 \
--enable-vala \
--disable-static")
if get.buildTYPE() == "emul32":
shelltools.export("CC","gcc -m32")
shelltools.system("PKG_CONFIG_PATH=/usr/lib32/pkgconfig USE_ARCH=m32 \
./configure --prefix=/usr --sysconfdir=/etc \
--enable-svgz --disable-gtk-doc")
else:
shelltools.export("CC","gcc")
shelltools.system("PKG_CONFIG_PATH=/usr/lib/pkgconfig USE_ARCH=64 \
./configure --prefix=/usr --sysconfdir=/etc \
--libdir=/usr/lib \
--enable-svgz --disable-gtk-doc")
def build():
autotools.make()
......
......@@ -53,7 +53,19 @@
<Path fileType="locale">/usr/share/locale</Path>
</Files>
</Package>
<Package>
<Name>librsvg-32bit</Name>
<BuildType>emul32</BuildType>
<RuntimeDependencies>
<Dependency>libcroco-32bit</Dependency>
<Dependency>gtk3-32bit</Dependency>
<Dependency>pango-32bit</Dependency>
<Dependency>gdk-pixbuf-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32</Path>
</Files>
</Package>
<Package>
<Name>librsvg-devel</Name>
<RuntimeDependencies>
......
......@@ -23,14 +23,15 @@ def setup():
--disable-embedded-tests \
--disable-modular-tests \
--disable-doxygen-docs \
--disable-systemd \
--disable-libaudit \
--disable-silent-rules \
--enable-inotify \
--enable-user-session \
--with-xml=expat \
--with-system-pid-file=/run/dbus/pid \
--with-system-socket=/run/dbus/system_bus_socket \
--with-console-auth-dir=/run/console/ \
--with-system-pid-file=/var/run/dbus/pid \
--with-system-socket=/var/run/dbus/system_bus_socket \
--with-console-auth-dir=/var/run/console/ \
--with-session-socket-dir=/tmp \
--with-dbus-user=dbus \
--enable-abstract-sockets=auto \
......@@ -39,9 +40,8 @@ def setup():
if get.buildTYPE() == "emul32":
options += "\
--disable-xml-docs \
--libdir=/usr/lib32 \
--disable-doxygen-docs"
# Build only libdbus
inarytools.dosed("Makefile.am", "(.*SUBDIRS=dbus) .*", "\\1")
autotools.autoreconf("-vif")
autotools.configure(options)
......@@ -57,10 +57,9 @@ def install():
if get.buildTYPE() == "emul32": return
# needs to exist for the system socket
inarytools.dodir("/run/dbus")
inarytools.dodir("/var/run/dbus")
inarytools.dodir("/var/lib/dbus")
inarytools.dodir("/usr/share/dbus-1/services")
os.system("/bin/chown root:dbus {}/usr/libexec/dbus-daemon-launch-helper".format(get.installDIR()))
os.system("/bin/chmod -v 4750 {}/usr/libexec/dbus-daemon-launch-helper".format(get.installDIR()))
inarytools.dodoc("AUTHORS", "ChangeLog", "NEWS*", "README*", "doc/TODO", "doc/*.txt")
inarytools.dohtml("doc/")
......@@ -21,6 +21,9 @@ start_pre() {
# We need to test if /var/run/dbus exists, since script will fail if it does not
checkpath -q -d /var/run/dbus
if [ -e /var/run/dbus.pid ]; then
rm -f /var/run/dbus.pid
fi
}
stop_post() {
......
d /run/dbus 0755 root root - -
d /var/run/dbus 0755 root root - -
......@@ -14,7 +14,7 @@
<PartOf>system.base</PartOf>
<Summary>A message bus system, a simple way for applications to talk to each other</Summary>
<Description>D-Bus supplies both a system daemon (for events such as "new hardware device added" or "printer queue changed") and a per-user-login-session daemon (for general IPC needs among user applications). Also, the message bus is built on top of a general one-to-one message passing framework, which can be used by any two apps to communicate directly (without going through the message bus daemon). Currently the communicating applications are on one computer, but TCP/IP option is available and remote support planned.</Description>
<Archive sha1sum="06e3412a7d9c7e345bfcfb027016c634e20f7ece" type="targz">https://dbus.freedesktop.org/releases/dbus/dbus-1.12.16.tar.gz</Archive>
<Archive sha1sum="85e86694d14e872c3a83b79a0c60063f33baaba7">https://dbus.freedesktop.org/releases/dbus/dbus-1.13.12.tar.xz</Archive>
<BuildDependencies>
<Dependency>expat-devel</Dependency>
<Dependency>libX11-devel</Dependency>
......@@ -40,8 +40,10 @@
<Path fileType="library">/usr/libexec</Path>
<Path fileType="data">/usr/share/dbus-1</Path>
<Path fileType="data">/usr/share/xml</Path>
<Path fileType="data">/var/run/dbus</Path>
<Path fileType="data">/run/dbus</Path>
<Path fileType="data">/var/lib/dbus</Path>
<Path fileType="data">/lib/dbus</Path>
<Path fileType="data">/lib/systemd/system</Path>
</Files>
<AdditionalFiles>
......@@ -129,6 +131,13 @@
</Files>
</Package>
<History>
<Update release="7">
<Date>2020-02-08</Date>
<Version>1.13.12</Version>
<Comment>Openrc servisi çakılması giderildi. 1.13.12 sürümüne yükseltildi.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="6">
<Date>2019-12-16</Date>
<Version>1.12.16</Version>
......
......@@ -10,7 +10,7 @@ OUR_DESC = "dbus"
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
try:
os.system("groupadd -g %d %s" % (OUR_ID, OUR_NAME))
os.system("useradd -m -d /run/dbus -r -s /bin/false -u %d -g %d %s -c \"%s\"" % (OUR_ID, OUR_ID, OUR_NAME, OUR_DESC))
os.system("useradd -m -d /var/run/dbus -r -s /bin/false -u %d -g %d %s -c \"%s\"" % (OUR_ID, OUR_ID, OUR_NAME, OUR_DESC))
except:
pass
......
......@@ -121,6 +121,13 @@
</Package>
<History>
<Update release="5">
<Date>2019-12-13</Date>
<Version>3.2.9</Version>
<Comment>Automatic version bump.</Comment>
<Name>Ali Rıza KESKİN</Name>
<Email>parduscix@yandex.ru</Email>
</Update>
<Update release="4">
<Date>2019-12-13</Date>
<Version>3.2.9</Version>
......
......@@ -7,6 +7,7 @@ def createNode(mode, uid, gid, minor, major, path):
os.system("/bin/chown %s:%s %s" % (uid, gid, path))
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
os.system("mkdir -p /lib/udev/devices/net 2>/dev/null")
createNode(600, "root", "root", 1, 11, "/lib/udev/devices/kmsg")
createNode(666, "root", "root", 1, 3, "/lib/udev/devices/null")
createNode(666, "root", "root", 1, 5, "/lib/udev/devices/zero")
......@@ -23,13 +24,6 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
os.system("/sbin/udevadm hwdb --update")
if os.path.exists("/lib/udev/devices/rtc"):
os.unlink("/lib/udev/devices/rtc")
# Migrate UDEV database
if fromVersion and int(fromVersion) < 165:
os.system("/sbin/udevadm info --convert-db &> /dev/null")
def postRemove():
pass
......
......@@ -14,9 +14,6 @@
<Summary>Application that allows non-privileged applications to write utmp (login) info</Summary>
<Description>Utempter is a utility that allows non-privileged applications such as terminal emulators to modify the utmp database without having to setuid root.</Description>
<Archive sha1sum="1964279755290c4b576f2db0ed518e2b45a9ca53" type="tarbz2">ftp://ftp.altlinux.org/pub/people/ldv/utempter/libutempter-1.1.6.tar.bz2</Archive>
<Patches>
<Patch level="1">libutempter-pierelro.patch</Patch>
</Patches>
</Source>
<Package>
......@@ -27,9 +24,6 @@
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
<Provides>
<SCOM script="package.py">System.Package</SCOM>
</Provides>
</Package>
<Package>
......@@ -44,6 +38,13 @@
</Package>
<History>
<Update release="2">
<Date>2020-02-07</Date>
<Version>1.1.6</Version>
<Comment>Rebuild.</Comment>
<Name>Süleyman Poyraz</Name>
<Email>zaryob.dev@gmail.com</Email>
</Update>
<Update release="1">
<Date>2019-09-15</Date>
<Version>1.1.6</Version>
......
#!/usr/bin/env python3
import os
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
ugstr = "root:utmp"
os.spawnvp(os.P_NOWAIT, "/bin/chown", ["/bin/chown", ugstr, "/usr/sbin/utempter"])
os.spawnvp(os.P_NOWAIT, "/bin/chmod", ["/bin/chmod", "2775", "/usr/sbin/utempter"])
for file in ["/var/log/wtmp", "/run/utmp"]:
if os.path.exists(file):
os.spawnvp(os.P_NOWAIT, "/bin/chown", ["/bin/chown", ugstr, file])
os.spawnvp(os.P_NOWAIT, "/bin/chmod", ["/bin/chmod", "664", file])
def preRemove():
pass
def postRemove():
pass
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment