- CRUX - lists.crux.nu

Fwd: [DNG] New goodies from systemd
by David L. Craig 29 Jul '23

29 Jul '23

Devuan's DNG (Debian Not Gnome) list has a subthread going about systemd 254 changes related to deprecating sysv script support. I wanted to be sure CRUXers are aware of this. The complete thread (currently through July 28) is at https://lists.dyne.org/lurker/thread/20230728.071036.81291f54.en.html ----- Forwarded message from tito via Dng <dng(a)lists.dyne.org> ----- From: tito via Dng <dng(a)lists.dyne.org> List-Id: "The first mailinglist after debianfork.org" <dng.lists.dyne.org> To: dng(a)lists.dyne.org Date: Sat, 29 Jul 2023 08:13:22 +0200 Subject: Re: [DNG] New goodies from systemd On Sat, 29 Jul 2023 14:30:36 +1000 onefang <onefang_devuan(a)sledjhamr.org> wrote: > On 2023-07-29 08:18:54, Alif Radhitya Wardana wrote: > > Based on this changelog, what will happen in the future to SysV? I mean, > > if systemd forces people to create native systemd units, will people drop > > sysv scripts on their apps? > > > > On July 29, 2023 3:20:17 AM GMT+07:00, tito via Dng <dng(a)lists.dyne.org> > > wrote: > > > > Hi, > > A new, official systemd release (254) has just been tagged: > > > > * Support for System V service scripts is now deprecated and will be > > removed in a future release. Please make sure to update your software > > *now* to include a native systemd unit file instead of a legacy > > System V script to retain compatibility with future systemd releases. > > > > A wonderful excuse to remove the last init scripts from packages. > > Do I have to resurrect my ancient LSB compliant SysV init code that could > figure out dependencies, run things in parallel, and even work with init > "scripts" written in ANY language? It was written as a busybox module, > and could even cope with multiple other init "scripts" as modules in the > same busybox binary. LSB compliance means it reads the headers, which in > typical init scripts are shell comments in the first few lines of the > script. > > I could teach it how to grok shitsemDie units. > Hi, yes using the info contained in .service units would be a elegant solution, but they ship a lot of them (and timers, targets, etc) so I suspect that picking the right ones is not simple without hardcoding the names (not so elegant), also the command lines used are different as the ones in SysV init scripts (daemonizing, logging). I would like to see your busybox module as I love busybox code. I recall that something like what you propose maybe was attempted (as a GSOC?). Ciao, Tito _______________________________________________ Dng mailing list Dng(a)lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng ----- End forwarded message ----- -- <not cent from sell> May the LORD God bless you exceedingly abundantly! Dave_Craig______________________________________________ "So the universe is not quite as you thought it was. You'd better rearrange your beliefs, then. Because you certainly can't rearrange the universe." __--from_Nightfall_by_Asimov/Silverberg_________________

3 2

Fwd: Re: [DNG] New goodies from systemd
by David L. Craig 29 Jul '23

29 Jul '23

More on the busybox code... ============ Forwarded message ============ From: onefang <onefang_devuan(a)sledjhamr.org> To: <dng(a)lists.dyne.org> Date: Sat, 29 Jul 2023 07:23:27 -0400 Subject: Re: [DNG] New goodies from systemd ============ Forwarded message ============ On 2023-07-29 08:13:22, tito via Dng wrote: > On Sat, 29 Jul 2023 14:30:36 +1000 > onefang <mailto:onefang_devuan@sledjhamr.org> wrote: > > > On 2023-07-29 08:18:54, Alif Radhitya Wardana wrote: > > > Based on this changelog, what will happen in the future to SysV? I mean, > > > if systemd forces people to create native systemd units, will people drop > > > sysv scripts on their apps? > > > > > > On July 29, 2023 3:20:17 AM GMT+07:00, tito via Dng <mailto:dng@lists.dyne.org> > > > wrote: > > > > > > Hi, > > > A new, official systemd release (254) has just been tagged: > > > > > > * Support for System V service scripts is now deprecated and will be > > > removed in a future release. Please make sure to update your software > > > *now* to include a native systemd unit file instead of a legacy > > > System V script to retain compatibility with future systemd releases. > > > > > > A wonderful excuse to remove the last init scripts from packages. > > > > Do I have to resurrect my ancient LSB compliant SysV init code that could > > figure out dependencies, run things in parallel, and even work with init > > "scripts" written in ANY language? It was written as a busybox module, > > and could even cope with multiple other init "scripts" as modules in the > > same busybox binary. LSB compliance means it reads the headers, which in > > typical init scripts are shell comments in the first few lines of the > > script. > > > > I could teach it how to grok shitsemDie units. > > > > Hi, > yes using the info contained in .service units would be > a elegant solution, but they ship a lot of them (and timers, > targets, etc) so I suspect that picking the right ones > is not simple without hardcoding the names (not so elegant), > also the command lines used are different as the ones > in SysV init scripts (daemonizing, logging). If I ever go ahead with this, I'll figure it out. I'm great at that. B-) > I would like to see your busybox module as I love busybox > code. I recall that something like what you propose maybe > was attempted (as a GSOC?). Since you asked, I moved it from SourceForge to my own server (like I had before with my github projects), and converted it to git from cvs. https://sledjhamr.org/cgit/urunlevel/ Haven't touched it in 18 years. lol -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. _______________________________________________ Dng mailing list mailto:Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng

1 0

fyi (my port-up.sh says): BAD: libarchive mesa
by Steffen Nurpmeso 22 Jul '23

22 Jul '23

I could get over failing to compile these via ln -s /usr/lib/librhash.so.1 /usr/lib/librhash.so.0 and ln -s /usr/bin/glslang /usr/bin/glslangValidator respectively. --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt)

1 0

crux.nu: git warning
by Steffen Nurpmeso 22 Jul '23

22 Jul '23

Hello. Since some time i see remote: warning: unable to access '/root/.config/git/attributes': Permission denied for all repos eg Fetching updates from git://crux.nu/ports/core.git Updating collection core HTTPS access would be nice but i think has never been set free. Whatever. Just because it (the warning) comes, also coloured in yellow. Ciao. --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt)

2 2

ports/opt (3.7): [notify] samba: update to 4.18.5, security fixes
by crux＠crux.nu 21 Jul '23

21 Jul '23

commit 571bb33adbc3db1c730d5f6cd27f868f9222209b Author: Juergen Daubert <jue(a)jue.li> Date: Fri Jul 21 11:41:38 2023 +0200 [notify] samba: update to 4.18.5, security fixes see https://www.samba.org/samba/history/samba-4.18.5.html diff --git a/samba/.signature b/samba/.signature index 6076f1dc8..6b347b384 100644 --- a/samba/.signature +++ b/samba/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QKDopbLJTAouB+6DltB6HRy/gqxbQJuAinQ6qR2roOhr86xLaGbbcfQkwdGzPyiI6r+LZ9hci4zfGY/uv07ZAE= -SHA256 (Pkgfile) = 57cf5e6458ea4f48722557f48aca17d9daef1fa3758658f47e5e27316a9cf3ad +RWSE3ohX2g5d/agG/sBTiJ9YEA92OqeYHndL3IjPNolxFeTEwyHDB3fLCyil88p7YsNvnnnkkH0NZ4HcNxVFEPwgieJV0dkyHgs= +SHA256 (Pkgfile) = 744f3ff52696e2058cb92833f7d93cf1e57292903fe4103d60330f4d41e588a5 SHA256 (.footprint) = c2a58957901172b1e26d7f3d4b1db05a94e9124abc4d6ca90b8900e4e9f72669 -SHA256 (samba-4.18.4.tar.gz) = 6ba7b3503cc59c9ff4f6fcb1b510c2c855fff93e0b366ab891a32a4732e88e53 +SHA256 (samba-4.18.5.tar.gz) = 095256ac332e1d9fbf9b7ff7823f92a3233d3ed658ce7fc9b33905c2243f447f SHA256 (samba.rc) = 0ab5a29dd85d5107cea902c21dd8426d20c3bcb2ce28a5add10d572bb88adc63 SHA256 (samba.pam) = c872a9efb2f7151e51e10fada4a75d69f5f5bd5afb1db29b64e8288c7cdc8b20 diff --git a/samba/Pkgfile b/samba/Pkgfile index 0f4db3944..c9363c8b7 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -4,7 +4,7 @@ # Depends on: dbus gnutls ldb libarchive linux-pam gnutls jansson p5-json p5-parse-yapp popt python3 rpcsvc-proto tdb tevent name=samba -version=4.18.4 +version=4.18.5 release=1 source=(https://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ samba.rc samba.pam)

1 0

Cannot update gettext package
by lain. 20 Jul '23

20 Jul '23

Dear CRUX team, The package "gettext" can't be updated due to a footprint mismatch. > =======> ERROR: Footprint mismatch found: > MISSING -rw-r--r-- root/root usr/lib/libgettextlib.a > =======> ERROR: Building '/usr/ports/core/gettext/gettext#0.22-1.pkg.tar.gz' failed. -- lain. Did you know that? 90% of all emails sent on a daily basis are being sent in plain text, and it's super easy to intercept emails as they flow over the internet? Never send passwords, tokens, personal information, or other volunerable information without proper PGP encryption! If you're writing your emails unencrypted, please consider sending PGP encrypted emails for security reasons. You can find my PGP public key at: https://fair.moe/lain.asc Every good email client is able to send encrypted emails. If yours can't, then you should consider switching to a secure email client, because yours just sucks. My recommendations are Claws Mail or NeoMutt. For instructions on how to encrypt your emails: https://unixsheikh.com/tutorials/gnupg-tutorial.html

2 1

ports/core (3.7): [notify] curl: update to 8.2.0, security fixes
by crux＠crux.nu 19 Jul '23

19 Jul '23

commit 6d26c63bbdd5ffd943663706a2618720ac1e515e Author: Juergen Daubert <jue(a)jue.li> Date: Wed Jul 19 10:02:18 2023 +0200 [notify] curl: update to 8.2.0, security fixes see https://curl.se/docs/security.html diff --git a/curl/.footprint b/curl/.footprint index 0e123358..fab3ec1b 100644 --- a/curl/.footprint +++ b/curl/.footprint @@ -194,6 +194,7 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_HAPROXYPROTOCOL.3.gz +-rw-r--r-- root/root usr/share/man/man3/CURLOPT_HAPROXY_CLIENT_IP.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_HEADER.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_HEADERDATA.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_HEADERFUNCTION.3.gz @@ -236,7 +237,7 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/CURLOPT_MAIL_AUTH.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_MAIL_FROM.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_MAIL_RCPT.3.gz --rw-r--r-- root/root usr/share/man/man3/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3.gz +-rw-r--r-- root/root usr/share/man/man3/CURLOPT_MAIL_RCPT_ALLOWFAILS.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_MAXAGE_CONN.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_MAXCONNECTS.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_MAXFILESIZE.3.gz @@ -482,6 +483,8 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/curl_multi_timeout.3.gz -rw-r--r-- root/root usr/share/man/man3/curl_multi_wait.3.gz -rw-r--r-- root/root usr/share/man/man3/curl_multi_wakeup.3.gz +-rw-r--r-- root/root usr/share/man/man3/curl_pushheader_byname.3.gz +-rw-r--r-- root/root usr/share/man/man3/curl_pushheader_bynum.3.gz -rw-r--r-- root/root usr/share/man/man3/curl_share_cleanup.3.gz -rw-r--r-- root/root usr/share/man/man3/curl_share_init.3.gz -rw-r--r-- root/root usr/share/man/man3/curl_share_setopt.3.gz @@ -512,4 +515,5 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/libcurl-thread.3.gz -rw-r--r-- root/root usr/share/man/man3/libcurl-tutorial.3.gz -rw-r--r-- root/root usr/share/man/man3/libcurl-url.3.gz +-rw-r--r-- root/root usr/share/man/man3/libcurl-ws.3.gz -rw-r--r-- root/root usr/share/man/man3/libcurl.3.gz diff --git a/curl/.signature b/curl/.signature index db9c24ec..7abbd294 100644 --- a/curl/.signature +++ b/curl/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqrtdjqzgQ9jVdtH+8yo/2KGELFRNDRwfznoV7yTWntQUlCAm6SM1yvhkO2ztahz8nOXCazqyY1OWDmXH3ogMPgQ= -SHA256 (Pkgfile) = 84c655b6a9a6a03445e152726f480a1c8dbf18f9fcf525b08dee654dfdb3cfa1 -SHA256 (.footprint) = a0b16bec8042dc6b348973422d9cd6b2af9468eb38731ab9666550e684795b77 -SHA256 (curl-8.1.2.tar.xz) = 31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6 +RWRJc1FUaeVeqh87er6EdIeKpIoV5C0kheOMjE8i3aggDYGaw7dj1kw6m4hMFhSeERZH1nfEqkvkyFpTNvnfVmeXIz6H7wIIOws= +SHA256 (Pkgfile) = 02974fb8e9deb1d65b738fce350dba223afd070a1c997d2a0f00dc29340b5eec +SHA256 (.footprint) = 66965c7953e03bd65d906a04259bab97f5d420f78a57e0ea1f8040d8483f9aac +SHA256 (curl-8.2.0.tar.xz) = 2859ec79e2cd96e976a99493547359b8001af1d1e21f3a3a3b846544ef54500f diff --git a/curl/Pkgfile b/curl/Pkgfile index 58ee69c9..c55d7ec6 100644 --- a/curl/Pkgfile +++ b/curl/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libnghttp2 openssl zlib zstd name=curl -version=8.1.2 +version=8.2.0 release=1 source=(https://curl.haxx.se/download/$name-$version.tar.xz)

1 0

ports/compat-32 (3.7): [notify] libappindicator-sharp-32: might need manual downgrade! updated source
by crux＠crux.nu 08 Jul '23

08 Jul '23

commit 6f05ea3ab5aa4c700d0d242b61b3437badc550e8 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jul 9 00:12:43 2023 +0200 [notify] libappindicator-sharp-32: might need manual downgrade! updated source diff --git a/libappindicator-sharp-32/.signature b/libappindicator-sharp-32/.signature index 53e9a1f..3189092 100644 --- a/libappindicator-sharp-32/.signature +++ b/libappindicator-sharp-32/.signature @@ -1,14 +1,10 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXTa/ZVltRcVi1fU7pBGwJ3jPyGhEYMTSehtckff6+ZuCKpvg1ftHPaup8WNM5RaZSal49Gbg+pxmQsf5XF7Y9As= -SHA256 (Pkgfile) = 71b71d90cb38339e30ef8578314bb5b6672b55be256e11fd2a1ae5b15e0a9c6e +RWSwxGo/zH7eXeSnAJiN8VcIlVguDasp0Izx+0qVWajxZ0xgI4jfDvBhunwx81irikST49Wru9zDrV7X8Jle5ndsJPebxXWGfwQ= +SHA256 (Pkgfile) = fb02933fa79e84ab78550bc4ea52d1123af9d9f06bdd0ce41b9c5eb02dee9c99 SHA256 (.footprint) = 1738e72615e69d301cf39f11b475cca30834689cc6b67c45178a8c4ab51a277e -SHA256 (libappindicator-16.10.tar.gz) = f33e0e06096fa8f8ca560ffcd84b8eb64830fa7308b30964c77bd5f45d0c497e +SHA256 (libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz) = 94e7096a49c400628ecddcafe313d63bf917d95a90ab994930909de724604e0a SHA256 (0001-Glib.Timeout-fix.patch) = bc7e3d5db0b9b324dc072f807519547fdc2c96514eb17aa07a71117a787d9b80 SHA256 (0002-Fix-mono-nunit-pkgconfig-name.patch) = d60af265af61cf429158267b391c377adb8ee8a24f0cef72c3f10f202cec6c6f SHA256 (0003-Fix-Mono-assemblies-directory.patch) = d923cab3e2704758ce4d41c356e2822234f291f202fce6c3db12daec46f1e8ac SHA256 (badfunction.patch) = f4959649db01aada1fe303e2a3de1eac0b303955d69129f84a492771d600c808 -SHA256 (conditional-py-bindings.patch) = 40dc073f3825ff53ae16e3e37411bde2b70a9d9b89f8e8c85885e779b32d7260 -SHA256 (disable-mono.patch) = 3ec51b8923a65d8d71374977206239dd511a1775a60e3d72ca9f2b3b8f136ab8 -SHA256 (gtk3.patch) = 39fc14496fa491c933f224c6a977a23343d0daeebd93911f3538c29f1bf69407 SHA256 (improved-plasma-support.patch) = c199e075fef864eb9a24845986f5486ee3a4cc30f9209b417eaa005cf5dc98a4 -SHA256 (vala-inherit.patch) = 77635b7b5bc0686577a191e0ac78dcfba79f5e5695b6b72cae7c412e59bc736d diff --git a/libappindicator-sharp-32/Pkgfile b/libappindicator-sharp-32/Pkgfile index 6df03a9..3326057 100644 --- a/libappindicator-sharp-32/Pkgfile +++ b/libappindicator-sharp-32/Pkgfile @@ -4,22 +4,16 @@ # Depends on: libappindicator-gtk2-32 libappindicator-sharp name=libappindicator-sharp-32 -version=16.10 +version=12.10 release=1 -source=(http://unrealize.co.uk/source/libappindicator-16.10.tar.gz +source=(http://archive.ubuntu.com/ubuntu/pool/universe/liba/libappindicator/libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz 0001-Glib.Timeout-fix.patch 0002-Fix-mono-nunit-pkgconfig-name.patch 0003-Fix-Mono-assemblies-directory.patch badfunction.patch - conditional-py-bindings.patch - disable-mono.patch - gtk3.patch - improved-plasma-support.patch - vala-inherit.patch) + improved-plasma-support.patch) build() { - cd libappindicator-$version - # The next 3 patches shamelessly pinched from Arch patch -p1 -i $SRC/0001-Glib.Timeout-fix.patch patch -p1 -i $SRC/0002-Fix-mono-nunit-pkgconfig-name.patch @@ -28,15 +22,12 @@ build() { # This one is also from Arch(ish), but had to be recreated best it could patch -p1 -i $SRC/improved-plasma-support.patch - # Patch pinched from Gentoo - patch -p1 -i $SRC/conditional-py-bindings.patch - # Removed a function which had no declaration patch -p1 -i $SRC/badfunction.patch sed -i -e 's/ -Werror//' src/Makefile.am - export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig' export CSC='/usr/bin/mcs' + export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig' NOCONFIGURE=1 ./autogen.sh CXXFLAGS="$CXXFLAGS -std=c++11" \ @@ -53,6 +44,4 @@ build() { make make DESTDIR=$PKG -C bindings/mono -j1 install mv $PKG/usr/lib/mono $PKG/usr/lib32/mono - -# rm -r $PKG/usr/{lib,include,share} } diff --git a/libappindicator-sharp-32/conditional-py-bindings.patch b/libappindicator-sharp-32/conditional-py-bindings.patch deleted file mode 100644 index c916d9b..0000000 --- a/libappindicator-sharp-32/conditional-py-bindings.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/bindings/Makefile.am 2015-07-10 10:04:18.091199191 +0200 -+++ b/bindings/Makefile.am 2015-07-10 10:19:47.047974439 +0200 -@@ -3,8 +3,10 @@ - vala - else - SUBDIRS = \ -- python \ - vala -+if HAS_PYTHON -+SUBDIRS += python -+endif - endif - - if HAS_MONO ---- a/configure.ac 2015-07-16 13:28:41.007502838 +0200 -+++ b/configure.ac_new 2015-07-16 13:53:18.118602877 +0200 -@@ -188,25 +188,37 @@ - PYGTK_REQUIRED=2.14.0 - PYGOBJECT_REQUIRED=0.22 - --AM_PATH_PYTHON(2.3.5) --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -+AC_ARG_ENABLE([python], -+ AC_HELP_STRING([--enable-python], [Enable python for GTK2 build]),, -+ [enable_python=yes]) - --PKG_CHECK_MODULES(APPINDICATOR_PYTHON, -+if test x"$with_gtk" = x"3" ; then -+ enable_python=no -+fi -+ -+AM_CONDITIONAL(HAS_PYTHON, test x"${enable_python}" != x"no") -+ -+if test x"$enable_python" != x"no" ; then -+ AM_PATH_PYTHON(2.3.5) -+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -+ -+ PKG_CHECK_MODULES(APPINDICATOR_PYTHON, - [ - pygtk-2.0 >= $PYGTK_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED_VERSION - pygobject-2.0 >= $PYGOBJECT_REQUIRED - ]) - --AC_MSG_CHECKING(for pygtk defs) --PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` --AC_SUBST(PYGTK_DEFSDIR) --AC_MSG_RESULT($PYGTK_DEFSDIR) -- --AC_MSG_CHECKING(for pygtk codegen) --PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" --AC_SUBST(PYGTK_CODEGEN) --AC_MSG_RESULT($PYGTK_CODEGEN) -+ AC_MSG_CHECKING(for pygtk defs) -+ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` -+ AC_SUBST(PYGTK_DEFSDIR) -+ AC_MSG_RESULT($PYGTK_DEFSDIR) -+ -+ AC_MSG_CHECKING(for pygtk codegen) -+ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" -+ AC_SUBST(PYGTK_CODEGEN) -+ AC_MSG_RESULT($PYGTK_CODEGEN) -+fi - - ######################### - # Check if build tests -@@ -278,4 +290,5 @@ - Tests: $enable_tests - Mono tests: $have_nunit - gcov: $use_gcov -+ Python: $enable_python - ]) diff --git a/libappindicator-sharp-32/disable-mono.patch b/libappindicator-sharp-32/disable-mono.patch deleted file mode 100644 index a8da053..0000000 --- a/libappindicator-sharp-32/disable-mono.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2017-10-23 14:05:48.291548000 +0000 -+++ b/configure.ac 2017-10-23 15:37:41.434800880 +0000 -@@ -104,7 +104,7 @@ - # Check for Mono support - ########################### - --MONO_REQUIRED_VERSION=1.0 -+MONO_REQUIRED_VERSION=9999 - PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) - AM_CONDITIONAL(HAS_MONO, [test "x$has_mono" = "xtrue"]) - -@@ -143,7 +143,7 @@ - AC_SUBST(GENERATED_SOURCES) - - GLIB_SHARP_REQ_VERSION=2.12.1 --GTK_SHARP_REQ_VERSION=2.12 -+GTK_SHARP_REQ_VERSION=9999 - PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION, has_gtksharp=true, has_gtksharp=false) - - PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION, has_gapi=true, has_gapi=false) diff --git a/libappindicator-sharp-32/gtk3.patch b/libappindicator-sharp-32/gtk3.patch deleted file mode 100644 index 068af90..0000000 --- a/libappindicator-sharp-32/gtk3.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Naur a/autogen.sh b/autogen.sh ---- a/autogen.sh 2017-10-23 08:03:29.000000000 +0100 -+++ b/autogen.sh 2017-10-23 10:26:05.918283577 +0100 -@@ -10,4 +10,4 @@ - gtkdocize || exit 1 - USE_GNOME2_MACROS=1 \ - USE_COMMON_DOC_BUILD=yes \ --gnome-autogen.sh --enable-gtk-doc $@ -+gnome-autogen.sh --enable-gtk-doc --with-gtk=3 $@ diff --git a/libappindicator-sharp-32/vala-inherit.patch b/libappindicator-sharp-32/vala-inherit.patch deleted file mode 100644 index e71cb69..0000000 --- a/libappindicator-sharp-32/vala-inherit.patch +++ /dev/null @@ -1,14 +0,0 @@ -# http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/tr… -=== modified file 'bindings/vala/appindicator-0.1-custom.vala' ---- a/bindings/vala/appindicator-0.1-custom.vala 2011-09-23 15:46:27 +0000 -+++ b/bindings/vala/appindicator-0.1-custom.vala 2012-10-10 23:33:35 +0000 -@@ -23,7 +23,7 @@ - */ - - namespace AppIndicator { -- [CCode (type_check_function = "IS_APP_INDICATOR")] -+ [CCode (type_check_function = "IS_APP_INDICATOR", type_id = "app_indicator_get_type ()")] - public class Indicator : GLib.Object { - } - } -

1 0

ports/compat-32 (3.7): [notify] libappindicator-gtk2-32: might need manual downgrade! updated source, cleaned up dependencies
by crux＠crux.nu 08 Jul '23

08 Jul '23

commit ff2fcf9c38b646ea736c08cf31a42dcf7dd2c7b5 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jul 9 00:10:13 2023 +0200 [notify] libappindicator-gtk2-32: might need manual downgrade! updated source, cleaned up dependencies diff --git a/libappindicator-gtk2-32/.signature b/libappindicator-gtk2-32/.signature index f81549c..95be010 100644 --- a/libappindicator-gtk2-32/.signature +++ b/libappindicator-gtk2-32/.signature @@ -1,14 +1,10 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXfhofK8ugWXKL93WYLs7MAIkJ3sWHEoazJc0qKQPjb4Ep9idfpb9XVbeIx4GlJNDaZGQgSsUpKCH00bHfeGqwQw= -SHA256 (Pkgfile) = cdcc1083ffda95020a71ebcb7afbc0d1b271d9416bd9d0a2063ca5fb0a8ca672 +RWSwxGo/zH7eXWTCWl7hG6R5uR1yynfV2Yjh94/NBqh7axDrDpMfs/bjBpFHjvKEgEpyb8ttT6rKr/IkIxl3f1LmWHmmDigPbAI= +SHA256 (Pkgfile) = 3eb77219b576dc128be619e05e56d0766a18e847c02fb853acd8db4df442de20 SHA256 (.footprint) = 89e564312dac82966b11a4756594dd745aa2859baa7acb8d8fa4379146eec610 -SHA256 (libappindicator-16.10.tar.gz) = f33e0e06096fa8f8ca560ffcd84b8eb64830fa7308b30964c77bd5f45d0c497e +SHA256 (libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz) = 94e7096a49c400628ecddcafe313d63bf917d95a90ab994930909de724604e0a SHA256 (0001-Glib.Timeout-fix.patch) = bc7e3d5db0b9b324dc072f807519547fdc2c96514eb17aa07a71117a787d9b80 SHA256 (0002-Fix-mono-nunit-pkgconfig-name.patch) = d60af265af61cf429158267b391c377adb8ee8a24f0cef72c3f10f202cec6c6f SHA256 (0003-Fix-Mono-assemblies-directory.patch) = d923cab3e2704758ce4d41c356e2822234f291f202fce6c3db12daec46f1e8ac SHA256 (badfunction.patch) = f4959649db01aada1fe303e2a3de1eac0b303955d69129f84a492771d600c808 -SHA256 (conditional-py-bindings.patch) = 40dc073f3825ff53ae16e3e37411bde2b70a9d9b89f8e8c85885e779b32d7260 -SHA256 (disable-mono.patch) = 3ec51b8923a65d8d71374977206239dd511a1775a60e3d72ca9f2b3b8f136ab8 -SHA256 (gtk3.patch) = 39fc14496fa491c933f224c6a977a23343d0daeebd93911f3538c29f1bf69407 SHA256 (improved-plasma-support.patch) = c199e075fef864eb9a24845986f5486ee3a4cc30f9209b417eaa005cf5dc98a4 -SHA256 (vala-inherit.patch) = 77635b7b5bc0686577a191e0ac78dcfba79f5e5695b6b72cae7c412e59bc736d diff --git a/libappindicator-gtk2-32/Pkgfile b/libappindicator-gtk2-32/Pkgfile index 7255b72..0d73ad6 100644 --- a/libappindicator-gtk2-32/Pkgfile +++ b/libappindicator-gtk2-32/Pkgfile @@ -1,24 +1,19 @@ # Description: Allow applications to extend a menu via Ayatana indicators in Unity, KDE or Systray # URL: https://launchpad.net/libappindicator # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: dbus-glib-32 libappindicator-gtk2 libdbusmenu-gtk2-32 libindicator-gtk2-32 +# Depends on: dbus-glib-32 libappindicator-gtk2 libdbusmenu-gtk2-32 name=libappindicator-gtk2-32 -version=16.10 +version=12.10 release=1 -source=(http://unrealize.co.uk/source/libappindicator-16.10.tar.gz - 0001-Glib.Timeout-fix.patch 0002-Fix-mono-nunit-pkgconfig-name.patch +source=(http://archive.ubuntu.com/ubuntu/pool/universe/liba/libappindicator/libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz + 0001-Glib.Timeout-fix.patch + 0002-Fix-mono-nunit-pkgconfig-name.patch 0003-Fix-Mono-assemblies-directory.patch badfunction.patch - conditional-py-bindings.patch - disable-mono.patch - gtk3.patch - improved-plasma-support.patch - vala-inherit.patch) + improved-plasma-support.patch) build() { - cd libappindicator-$version - # The next 3 patches shamelessly pinched from Arch patch -p1 -i $SRC/0001-Glib.Timeout-fix.patch patch -p1 -i $SRC/0002-Fix-mono-nunit-pkgconfig-name.patch @@ -27,9 +22,6 @@ build() { # This one is also from Arch(ish), but had to be recreated best it could patch -p1 -i $SRC/improved-plasma-support.patch - # Patch pinched from Gentoo - patch -p1 -i $SRC/conditional-py-bindings.patch - # Removed a function which had no declaration patch -p1 -i $SRC/badfunction.patch @@ -45,11 +37,6 @@ build() { --disable-{gtk-doc-html,python,mono-test,static,tests} \ --with-gtk=2 - sed -e 's/DIST_SUBDIRS = vala python mono/DIST_SUBDIRS = vala/g' \ - -e 's/am__append_1 = python//g' \ - -e 's/am__append_2 = mono//g' \ - -i bindings/Makefile - make make DESTDIR=$PKG -j1 install diff --git a/libappindicator-gtk2-32/conditional-py-bindings.patch b/libappindicator-gtk2-32/conditional-py-bindings.patch deleted file mode 100644 index c916d9b..0000000 --- a/libappindicator-gtk2-32/conditional-py-bindings.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/bindings/Makefile.am 2015-07-10 10:04:18.091199191 +0200 -+++ b/bindings/Makefile.am 2015-07-10 10:19:47.047974439 +0200 -@@ -3,8 +3,10 @@ - vala - else - SUBDIRS = \ -- python \ - vala -+if HAS_PYTHON -+SUBDIRS += python -+endif - endif - - if HAS_MONO ---- a/configure.ac 2015-07-16 13:28:41.007502838 +0200 -+++ b/configure.ac_new 2015-07-16 13:53:18.118602877 +0200 -@@ -188,25 +188,37 @@ - PYGTK_REQUIRED=2.14.0 - PYGOBJECT_REQUIRED=0.22 - --AM_PATH_PYTHON(2.3.5) --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -+AC_ARG_ENABLE([python], -+ AC_HELP_STRING([--enable-python], [Enable python for GTK2 build]),, -+ [enable_python=yes]) - --PKG_CHECK_MODULES(APPINDICATOR_PYTHON, -+if test x"$with_gtk" = x"3" ; then -+ enable_python=no -+fi -+ -+AM_CONDITIONAL(HAS_PYTHON, test x"${enable_python}" != x"no") -+ -+if test x"$enable_python" != x"no" ; then -+ AM_PATH_PYTHON(2.3.5) -+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -+ -+ PKG_CHECK_MODULES(APPINDICATOR_PYTHON, - [ - pygtk-2.0 >= $PYGTK_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED_VERSION - pygobject-2.0 >= $PYGOBJECT_REQUIRED - ]) - --AC_MSG_CHECKING(for pygtk defs) --PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` --AC_SUBST(PYGTK_DEFSDIR) --AC_MSG_RESULT($PYGTK_DEFSDIR) -- --AC_MSG_CHECKING(for pygtk codegen) --PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" --AC_SUBST(PYGTK_CODEGEN) --AC_MSG_RESULT($PYGTK_CODEGEN) -+ AC_MSG_CHECKING(for pygtk defs) -+ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` -+ AC_SUBST(PYGTK_DEFSDIR) -+ AC_MSG_RESULT($PYGTK_DEFSDIR) -+ -+ AC_MSG_CHECKING(for pygtk codegen) -+ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" -+ AC_SUBST(PYGTK_CODEGEN) -+ AC_MSG_RESULT($PYGTK_CODEGEN) -+fi - - ######################### - # Check if build tests -@@ -278,4 +290,5 @@ - Tests: $enable_tests - Mono tests: $have_nunit - gcov: $use_gcov -+ Python: $enable_python - ]) diff --git a/libappindicator-gtk2-32/disable-mono.patch b/libappindicator-gtk2-32/disable-mono.patch deleted file mode 100644 index a8da053..0000000 --- a/libappindicator-gtk2-32/disable-mono.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2017-10-23 14:05:48.291548000 +0000 -+++ b/configure.ac 2017-10-23 15:37:41.434800880 +0000 -@@ -104,7 +104,7 @@ - # Check for Mono support - ########################### - --MONO_REQUIRED_VERSION=1.0 -+MONO_REQUIRED_VERSION=9999 - PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) - AM_CONDITIONAL(HAS_MONO, [test "x$has_mono" = "xtrue"]) - -@@ -143,7 +143,7 @@ - AC_SUBST(GENERATED_SOURCES) - - GLIB_SHARP_REQ_VERSION=2.12.1 --GTK_SHARP_REQ_VERSION=2.12 -+GTK_SHARP_REQ_VERSION=9999 - PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION, has_gtksharp=true, has_gtksharp=false) - - PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION, has_gapi=true, has_gapi=false) diff --git a/libappindicator-gtk2-32/gtk3.patch b/libappindicator-gtk2-32/gtk3.patch deleted file mode 100644 index 068af90..0000000 --- a/libappindicator-gtk2-32/gtk3.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Naur a/autogen.sh b/autogen.sh ---- a/autogen.sh 2017-10-23 08:03:29.000000000 +0100 -+++ b/autogen.sh 2017-10-23 10:26:05.918283577 +0100 -@@ -10,4 +10,4 @@ - gtkdocize || exit 1 - USE_GNOME2_MACROS=1 \ - USE_COMMON_DOC_BUILD=yes \ --gnome-autogen.sh --enable-gtk-doc $@ -+gnome-autogen.sh --enable-gtk-doc --with-gtk=3 $@ diff --git a/libappindicator-gtk2-32/vala-inherit.patch b/libappindicator-gtk2-32/vala-inherit.patch deleted file mode 100644 index e71cb69..0000000 --- a/libappindicator-gtk2-32/vala-inherit.patch +++ /dev/null @@ -1,14 +0,0 @@ -# http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/tr… -=== modified file 'bindings/vala/appindicator-0.1-custom.vala' ---- a/bindings/vala/appindicator-0.1-custom.vala 2011-09-23 15:46:27 +0000 -+++ b/bindings/vala/appindicator-0.1-custom.vala 2012-10-10 23:33:35 +0000 -@@ -23,7 +23,7 @@ - */ - - namespace AppIndicator { -- [CCode (type_check_function = "IS_APP_INDICATOR")] -+ [CCode (type_check_function = "IS_APP_INDICATOR", type_id = "app_indicator_get_type ()")] - public class Indicator : GLib.Object { - } - } -

1 0

ports/contrib (3.7): [notify] libappindicator-gtk2: might need manual downgrade! updated source
by crux＠crux.nu 08 Jul '23

08 Jul '23

commit 0b9c6dea2275ee5bf2e85b4a5aa730ea53f95161 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jul 9 00:15:06 2023 +0200 [notify] libappindicator-gtk2: might need manual downgrade! updated source diff --git a/libappindicator-gtk2/.footprint b/libappindicator-gtk2/.footprint index 6071f7c4f..0a1ef83ce 100644 --- a/libappindicator-gtk2/.footprint +++ b/libappindicator-gtk2/.footprint @@ -6,7 +6,7 @@ drwxr-xr-x root/root usr/include/libappindicator-0.1/libappindicator/ -rw-r--r-- root/root usr/include/libappindicator-0.1/libappindicator/app-indicator.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/girepository-1.0/ --rw-r--r-- root/root usr/lib/girepository-1.0/AppIndicator-0.1.typelib +-rw-r--r-- root/root usr/lib/girepository-1.0/AppIndicator3-0.1.typelib -rwxr-xr-x root/root usr/lib/libappindicator.la lrwxrwxrwx root/root usr/lib/libappindicator.so -> libappindicator.so.1.0.0 lrwxrwxrwx root/root usr/lib/libappindicator.so.1 -> libappindicator.so.1.0.0 @@ -15,4 +15,4 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/appindicator-0.1.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/gir-1.0/ --rw-r--r-- root/root usr/share/gir-1.0/AppIndicator-0.1.gir +-rw-r--r-- root/root usr/share/gir-1.0/AppIndicator3-0.1.gir diff --git a/libappindicator-gtk2/.signature b/libappindicator-gtk2/.signature index 387d420bd..223a22664 100644 --- a/libappindicator-gtk2/.signature +++ b/libappindicator-gtk2/.signature @@ -1,14 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3ypQ69qb3NyjW0b7r5nrXFvtfbJ/ZLBq370Sq3aDnMlZxVzuivcHbv2bMfcvD4f+vPb5A82Awqa8U1opniZxwAw= -SHA256 (Pkgfile) = 2674731f13aaa31ecb7d5760fc9d38b84e98c6d93f0b05359ba0a4e268ac5e3e -SHA256 (.footprint) = ae26513dd8bf53e0928bbfa47053d65c98101041f85472ece7108bd08b804302 -SHA256 (libappindicator-16.10.tar.gz) = f33e0e06096fa8f8ca560ffcd84b8eb64830fa7308b30964c77bd5f45d0c497e +RWSagIOpLGJF30p2uUyIkbbxZERjpbYKy5mCvtDQ/v68ByrAQNB/R0PgvQF+1PbqAsuPoYaxRVqC6q0NZ3UYklbzkiTD+KPCIAk= +SHA256 (Pkgfile) = a9e7487feaf79d477fb7c9d7f24d2a4b2df4ba276ee59135d7ba18d592f94432 +SHA256 (.footprint) = 4ec772fdb9396a2ec93a93ee36b6e755e88460f975ec916d0b7e26729714ffde +SHA256 (libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz) = 94e7096a49c400628ecddcafe313d63bf917d95a90ab994930909de724604e0a SHA256 (0001-Glib.Timeout-fix.patch) = bc7e3d5db0b9b324dc072f807519547fdc2c96514eb17aa07a71117a787d9b80 SHA256 (0002-Fix-mono-nunit-pkgconfig-name.patch) = d60af265af61cf429158267b391c377adb8ee8a24f0cef72c3f10f202cec6c6f SHA256 (0003-Fix-Mono-assemblies-directory.patch) = d923cab3e2704758ce4d41c356e2822234f291f202fce6c3db12daec46f1e8ac SHA256 (badfunction.patch) = f4959649db01aada1fe303e2a3de1eac0b303955d69129f84a492771d600c808 -SHA256 (conditional-py-bindings.patch) = 40dc073f3825ff53ae16e3e37411bde2b70a9d9b89f8e8c85885e779b32d7260 -SHA256 (disable-mono.patch) = 3ec51b8923a65d8d71374977206239dd511a1775a60e3d72ca9f2b3b8f136ab8 -SHA256 (gtk3.patch) = 39fc14496fa491c933f224c6a977a23343d0daeebd93911f3538c29f1bf69407 SHA256 (improved-plasma-support.patch) = c199e075fef864eb9a24845986f5486ee3a4cc30f9209b417eaa005cf5dc98a4 -SHA256 (vala-inherit.patch) = 77635b7b5bc0686577a191e0ac78dcfba79f5e5695b6b72cae7c412e59bc736d diff --git a/libappindicator-gtk2/Pkgfile b/libappindicator-gtk2/Pkgfile index 2e61222fd..840157bde 100644 --- a/libappindicator-gtk2/Pkgfile +++ b/libappindicator-gtk2/Pkgfile @@ -1,19 +1,19 @@ # Description: Allow applications to extend a menu via Ayatana indicators in Unity, KDE or Systray # URL: https://launchpad.net/libappindicator # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: dbus-glib p5-xml-libxml libdbusmenu-gtk2 libindicator-gtk2 +# Depends on: dbus-glib libdbusmenu-gtk2 name=libappindicator-gtk2 -version=16.10 -release=3 -source=(http://unrealize.co.uk/source/libappindicator-16.10.tar.gz - 0001-Glib.Timeout-fix.patch 0002-Fix-mono-nunit-pkgconfig-name.patch - 0003-Fix-Mono-assemblies-directory.patch badfunction.patch - conditional-py-bindings.patch disable-mono.patch gtk3.patch - improved-plasma-support.patch vala-inherit.patch) +version=12.10 +release=1 +source=(http://archive.ubuntu.com/ubuntu/pool/universe/liba/libappindicator/libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz + 0001-Glib.Timeout-fix.patch + 0002-Fix-mono-nunit-pkgconfig-name.patch + 0003-Fix-Mono-assemblies-directory.patch + badfunction.patch + improved-plasma-support.patch) build() { - cd libappindicator-$version # The next 3 patches shamelessly pinched from Arch patch -p1 -i $SRC/0001-Glib.Timeout-fix.patch patch -p1 -i $SRC/0002-Fix-mono-nunit-pkgconfig-name.patch @@ -22,23 +22,18 @@ build() { # This one is also from Arch(ish), but had to be recreated best it could patch -p1 -i $SRC/improved-plasma-support.patch - # Patch pinched from Gentoo - patch -p1 -i $SRC/conditional-py-bindings.patch - # Removed a function which had no declaration patch -p1 -i $SRC/badfunction.patch sed -i -e 's/ -Werror//' src/Makefile.am NOCONFIGURE=1 ./autogen.sh - CXXFLAGS="$CXXFLAGS -std=c++11" \ + + CXXFLAGS+=" -std=c++11" \ ./configure --prefix=/usr \ --localstatedir=/var \ --disable-{gtk-doc-html,python,mono-test,static,tests} \ --with-gtk=2 - sed -e 's/DIST_SUBDIRS = vala python mono/DIST_SUBDIRS = vala/g' \ - -e 's/am__append_1 = python//g' \ - -e 's/am__append_2 = mono//g' \ - -i bindings/Makefile + make make DESTDIR=$PKG -j1 install } diff --git a/libappindicator-gtk2/conditional-py-bindings.patch b/libappindicator-gtk2/conditional-py-bindings.patch deleted file mode 100644 index c916d9ba2..000000000 --- a/libappindicator-gtk2/conditional-py-bindings.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/bindings/Makefile.am 2015-07-10 10:04:18.091199191 +0200 -+++ b/bindings/Makefile.am 2015-07-10 10:19:47.047974439 +0200 -@@ -3,8 +3,10 @@ - vala - else - SUBDIRS = \ -- python \ - vala -+if HAS_PYTHON -+SUBDIRS += python -+endif - endif - - if HAS_MONO ---- a/configure.ac 2015-07-16 13:28:41.007502838 +0200 -+++ b/configure.ac_new 2015-07-16 13:53:18.118602877 +0200 -@@ -188,25 +188,37 @@ - PYGTK_REQUIRED=2.14.0 - PYGOBJECT_REQUIRED=0.22 - --AM_PATH_PYTHON(2.3.5) --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -+AC_ARG_ENABLE([python], -+ AC_HELP_STRING([--enable-python], [Enable python for GTK2 build]),, -+ [enable_python=yes]) - --PKG_CHECK_MODULES(APPINDICATOR_PYTHON, -+if test x"$with_gtk" = x"3" ; then -+ enable_python=no -+fi -+ -+AM_CONDITIONAL(HAS_PYTHON, test x"${enable_python}" != x"no") -+ -+if test x"$enable_python" != x"no" ; then -+ AM_PATH_PYTHON(2.3.5) -+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -+ -+ PKG_CHECK_MODULES(APPINDICATOR_PYTHON, - [ - pygtk-2.0 >= $PYGTK_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED_VERSION - pygobject-2.0 >= $PYGOBJECT_REQUIRED - ]) - --AC_MSG_CHECKING(for pygtk defs) --PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` --AC_SUBST(PYGTK_DEFSDIR) --AC_MSG_RESULT($PYGTK_DEFSDIR) -- --AC_MSG_CHECKING(for pygtk codegen) --PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" --AC_SUBST(PYGTK_CODEGEN) --AC_MSG_RESULT($PYGTK_CODEGEN) -+ AC_MSG_CHECKING(for pygtk defs) -+ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` -+ AC_SUBST(PYGTK_DEFSDIR) -+ AC_MSG_RESULT($PYGTK_DEFSDIR) -+ -+ AC_MSG_CHECKING(for pygtk codegen) -+ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" -+ AC_SUBST(PYGTK_CODEGEN) -+ AC_MSG_RESULT($PYGTK_CODEGEN) -+fi - - ######################### - # Check if build tests -@@ -278,4 +290,5 @@ - Tests: $enable_tests - Mono tests: $have_nunit - gcov: $use_gcov -+ Python: $enable_python - ]) diff --git a/libappindicator-gtk2/disable-mono.patch b/libappindicator-gtk2/disable-mono.patch deleted file mode 100644 index a8da053aa..000000000 --- a/libappindicator-gtk2/disable-mono.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2017-10-23 14:05:48.291548000 +0000 -+++ b/configure.ac 2017-10-23 15:37:41.434800880 +0000 -@@ -104,7 +104,7 @@ - # Check for Mono support - ########################### - --MONO_REQUIRED_VERSION=1.0 -+MONO_REQUIRED_VERSION=9999 - PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) - AM_CONDITIONAL(HAS_MONO, [test "x$has_mono" = "xtrue"]) - -@@ -143,7 +143,7 @@ - AC_SUBST(GENERATED_SOURCES) - - GLIB_SHARP_REQ_VERSION=2.12.1 --GTK_SHARP_REQ_VERSION=2.12 -+GTK_SHARP_REQ_VERSION=9999 - PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION, has_gtksharp=true, has_gtksharp=false) - - PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION, has_gapi=true, has_gapi=false) diff --git a/libappindicator-gtk2/gtk3.patch b/libappindicator-gtk2/gtk3.patch deleted file mode 100644 index 068af900f..000000000 --- a/libappindicator-gtk2/gtk3.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Naur a/autogen.sh b/autogen.sh ---- a/autogen.sh 2017-10-23 08:03:29.000000000 +0100 -+++ b/autogen.sh 2017-10-23 10:26:05.918283577 +0100 -@@ -10,4 +10,4 @@ - gtkdocize || exit 1 - USE_GNOME2_MACROS=1 \ - USE_COMMON_DOC_BUILD=yes \ --gnome-autogen.sh --enable-gtk-doc $@ -+gnome-autogen.sh --enable-gtk-doc --with-gtk=3 $@ diff --git a/libappindicator-gtk2/vala-inherit.patch b/libappindicator-gtk2/vala-inherit.patch deleted file mode 100644 index e71cb690c..000000000 --- a/libappindicator-gtk2/vala-inherit.patch +++ /dev/null @@ -1,14 +0,0 @@ -# http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/tr… -=== modified file 'bindings/vala/appindicator-0.1-custom.vala' ---- a/bindings/vala/appindicator-0.1-custom.vala 2011-09-23 15:46:27 +0000 -+++ b/bindings/vala/appindicator-0.1-custom.vala 2012-10-10 23:33:35 +0000 -@@ -23,7 +23,7 @@ - */ - - namespace AppIndicator { -- [CCode (type_check_function = "IS_APP_INDICATOR")] -+ [CCode (type_check_function = "IS_APP_INDICATOR", type_id = "app_indicator_get_type ()")] - public class Indicator : GLib.Object { - } - } -

1 0