From 285ebad8602642d61006541852746fe06c4dd484 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Fri, 15 Apr 2022 00:30:01 +0300 Subject: [PATCH] upg cmake git qt6-base added gtkdialog --- cmake/PKGBUILD | 5 ++- cmake/PKGBUILD-arch | 4 +- cmake/deps | 1 - git/PKGBUILD | 7 +-- git/PKGBUILD-arch | 4 +- gtkdialog/PKGBUILD | 49 +++++++++++++++++++++ gtkdialog/PKGBUILD-aur | 38 ++++++++++++++++ gtkdialog/clean | 1 + gtkdialog/deps | 8 ++++ gtkdialog/gtkdialog-0.8.3-fno-common.patch | 51 ++++++++++++++++++++++ gtkdialog/time | 5 +++ qt6-base/PKGBUILD | 18 ++++---- qt6-base/PKGBUILD-arch | 17 ++++---- qt6-base/qt6-base-cflags.patch | 8 ++-- 14 files changed, 186 insertions(+), 30 deletions(-) create mode 100644 gtkdialog/PKGBUILD create mode 100644 gtkdialog/PKGBUILD-aur create mode 100644 gtkdialog/clean create mode 100644 gtkdialog/deps create mode 100644 gtkdialog/gtkdialog-0.8.3-fno-common.patch create mode 100644 gtkdialog/time diff --git a/cmake/PKGBUILD b/cmake/PKGBUILD index 6fe11cd..284ccaa 100644 --- a/cmake/PKGBUILD +++ b/cmake/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=cmake -pkgver=3.23.0 +pkgver=3.23.1 pkgrel=01 pkgdesc='A cross-platform open-source make system' arch=('x86_64') @@ -44,4 +44,5 @@ package() { license=('custom') -sha256sums=(5ab0a12f702f44013be7e19534cd9094d65cc9fe7b2cd0f8c9e5318e0fe4ac82) # cmake-3.23.0.tar.gz +sha256sums=(33fd10a8ec687a4d0d5b42473f10459bb92b3ae7def2b745dc10b192760869f3) # cmake-3.23.1.tar.gz + diff --git a/cmake/PKGBUILD-arch b/cmake/PKGBUILD-arch index 518399d..3f72a03 100644 --- a/cmake/PKGBUILD-arch +++ b/cmake/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Pierre Schmitz pkgname=cmake -pkgver=3.23.0 +pkgver=3.23.1 pkgrel=1 pkgdesc='A cross-platform open-source make system' arch=('x86_64') @@ -13,7 +13,7 @@ depends=('curl' 'libarchive' 'hicolor-icon-theme' 'jsoncpp' 'libjsoncpp.so' 'lib makedepends=('qt6-base' 'python-sphinx' 'emacs') optdepends=('qt6-base: cmake-gui') source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz") -sha512sums=('bcde8f2bf2fff6c4ab37a28c115b4b53d5fef0d4e38305420966cbd9f0026a4ffdcd4137f917a83458c1f380a137f7a7bd78f6fbd4d92fdcc5cf1dfbe4c02003') +sha512sums=('94893f888c0cbfc58e54a0bd65d6c0697fe4a0e95c678b7cb35e7dc8854d57eb360bfc952750f97983348817f847f6df85903f21a5857b1a3880b2a7eb6cc029') build() { cd ${pkgname}-${pkgver} diff --git a/cmake/deps b/cmake/deps index 9888c34..ea87c59 100644 --- a/cmake/deps +++ b/cmake/deps @@ -4,4 +4,3 @@ libuv rhash python-sphinx emacs-git -qt6-base diff --git a/git/PKGBUILD b/git/PKGBUILD index e41049d..e74c3cd 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=git -pkgver=2.35.2 +pkgver=2.35.3 pkgrel=01 pkgdesc='the fast distributed version control system w/o systemd' arch=('x86_64') @@ -129,6 +129,7 @@ license=('GPL2') validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano -sha256sums=(c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3 # git-2.35.2.tar.xz - 7eb028ed25ae08033358f998597be3c81ef6b6500cd7ec30cb189db75524e7ad # git-2.35.2.tar.sign +sha256sums=(15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2 # git-2.35.3.tar.xz + bfd4017fb4fa4e480b39caa83b0a3017795e71aea50568d97a5177bf58c23050 # git-2.35.3.tar.sign 7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45) # git-sysusers.conf + diff --git a/git/PKGBUILD-arch b/git/PKGBUILD-arch index 1509fae..93cde3b 100644 --- a/git/PKGBUILD-arch +++ b/git/PKGBUILD-arch @@ -2,7 +2,7 @@ # Maintainer: Dan McGee pkgname=git -pkgver=2.35.2 +pkgver=2.35.3 pkgrel=1 pkgdesc='the fast distributed version control system' arch=('x86_64') @@ -30,7 +30,7 @@ source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign} 'git-daemon@.service' 'git-daemon.socket' 'git-sysusers.conf') -sha256sums=('c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3' +sha256sums=('15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2' 'SKIP' '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91' 'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203' diff --git a/gtkdialog/PKGBUILD b/gtkdialog/PKGBUILD new file mode 100644 index 0000000..9d5b2a6 --- /dev/null +++ b/gtkdialog/PKGBUILD @@ -0,0 +1,49 @@ +#!/usr/bin/bash +# JOBoRun : Jwm OpenBox Obarun RUNit +# Maintainer : Joe Bo Run +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : http://pozol.eu +#-----------------------------------------| DESCRIPTION |--------------------------------------- + +pkgname=gtkdialog +pkgver=0.8.3 +pkgrel=02 +pkgdesc="A small utility for fast and easy Gtk2 GUI building w example scripts" +arch=(x86_64) +url="https://code.google.com/p/gtkdialog" +depends=(glade vte-common) +makedepends=(subversion automake autoconf bison flex) +optdepends=('gtkdialog-examples: sample projects - pfeme, pfontview, playmusic') +provides=(gtkdialog) +conflicts=(gtkdialog) +source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-$pkgver.tar.gz" + "gtkdialog-0.8.3-fno-common.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch?id=98692e4c4ad494b88c4902ca1ab3e6541190bbe8") + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -b -z .orig < ../gtkdialog-0.8.3-fno-common.patch +} + +build() { + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR=$pkgdir UPDATE_ICON_CACHE=true install +# rm -f $pkgdir/usr/share/info/dir + mkdir -p $pkgdir/usr/share/doc/$pkgname + cp -a examples $pkgdir/usr/share/doc/$pkgname/examples +} + +#---- license gpg-key sha256sums ---- + +license=(GPL) + +md5sums=(f8d2a2b912bcd5aa7da60984c19bc493 + 34d2362005eea17b0b230b70a6e048ca) + +sha256sums=(ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e # gtkdialog-0.8.3.tar.gz + 8e22aeb4665fae00138d84d66ef72c0841c808677677d399562078c5b4c44dac) # gtkdialog-0.8.3-fno-common.patch diff --git a/gtkdialog/PKGBUILD-aur b/gtkdialog/PKGBUILD-aur new file mode 100644 index 0000000..7e444cc --- /dev/null +++ b/gtkdialog/PKGBUILD-aur @@ -0,0 +1,38 @@ +# Maintainer: Brian Bidulock +# Contributor: OS Hazard +pkgname=gtkdialog +pkgver=0.8.3 +pkgrel=2 +pkgdesc="A small utility for fast and easy GUI building" +arch=('i686' 'x86_64') +url="https://code.google.com/p/gtkdialog" +license=('GPL') +depends=('libglade' 'vte-common') +makedepends=('subversion' 'automake' 'bison' 'flex') +optdepends=('gtkdialog-examples: sample projects - pfeme, pfontview, playmusic') +provides=('gtkdialog') +conflicts=('gtkdialog') +source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-$pkgver.tar.gz" + "gtkdialog-0.8.3-fno-common.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch?id=98692e4c4ad494b88c4902ca1ab3e6541190bbe8") +md5sums=('f8d2a2b912bcd5aa7da60984c19bc493' + '34d2362005eea17b0b230b70a6e048ca') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -b -z .orig < ../gtkdialog-0.8.3-fno-common.patch +} + +build() { + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR=$pkgdir UPDATE_ICON_CACHE=true install + rm -f $pkgdir/usr/share/info/dir + mkdir -p $pkgdir/usr/share/doc/$pkgname + cp -a examples $pkgdir/usr/share/doc/$pkgname/examples +} + diff --git a/gtkdialog/clean b/gtkdialog/clean new file mode 100644 index 0000000..e9c4190 --- /dev/null +++ b/gtkdialog/clean @@ -0,0 +1 @@ +rm -rf {src,pkg,gtk*gz} diff --git a/gtkdialog/deps b/gtkdialog/deps new file mode 100644 index 0000000..3d55dcf --- /dev/null +++ b/gtkdialog/deps @@ -0,0 +1,8 @@ +bison +automake +glade +vte-common +subversion +bison +autoconf +gtk2 diff --git a/gtkdialog/gtkdialog-0.8.3-fno-common.patch b/gtkdialog/gtkdialog-0.8.3-fno-common.patch new file mode 100644 index 0000000..86fa6a9 --- /dev/null +++ b/gtkdialog/gtkdialog-0.8.3-fno-common.patch @@ -0,0 +1,51 @@ +--- a/src/gtkdialog.h ++++ b/src/gtkdialog.h +@@ -40,24 +40,24 @@ + #define GTKD_FUNCTION_SIGNALS_BLOCK (function_signals_block++) + #define GTKD_FUNCTION_SIGNALS_UNBLOCK (function_signals_block--) + #define GTKD_FUNCTION_SIGNALS_RESET (function_signals_block = FALSE) +-gint function_signals_block; ++extern gint function_signals_block; + + /* Thunor: Used to control/override the widget packing expand and fill + * states at the project level */ +-gint project_space_expand; +-gint project_space_fill; ++extern gint project_space_expand; ++extern gint project_space_fill; + + /* The most recently created radiobutton widget (used for grouping) */ +-GtkWidget *lastradiowidget; ++extern GtkWidget *lastradiowidget; + + /* An accumulated list of menu accelerator groups to be added to the window */ +-GList *accel_groups; ++extern GList *accel_groups; + + /* A list of widgets to hide and to show */ +-GList *widget_hide_list, *widget_show_list; ++extern GList *widget_hide_list, *widget_show_list; + + /* An auto-incremented unique id for each window created */ +-gint window_id; ++extern gint window_id; + + void reset_program_source(void); + //Redundant: gint set_program_source(gchar *name); +--- a/src/gtkdialog.c ++++ b/src/gtkdialog.c +@@ -82,6 +82,14 @@ + gint geometry_x = 0; + gint geometry_y = 0; + ++gint function_signals_block; ++gint project_space_expand; ++gint project_space_fill; ++GtkWidget *lastradiowidget; ++GList *accel_groups; ++GList *widget_hide_list, *widget_show_list; ++gint window_id; ++ + static gboolean + get_geometry(const char *argument) + { diff --git a/gtkdialog/time b/gtkdialog/time new file mode 100644 index 0000000..7c9d7d1 --- /dev/null +++ b/gtkdialog/time @@ -0,0 +1,5 @@ + +real 0m12.585s +user 0m26.924s +sys 0m3.123s + diff --git a/qt6-base/PKGBUILD b/qt6-base/PKGBUILD index 240e334..585064d 100644 --- a/qt6-base/PKGBUILD +++ b/qt6-base/PKGBUILD @@ -5,7 +5,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=qt6-base -_qtver=6.2.4 +_qtver=6.3.0 pkgver=${_qtver/-/} pkgrel=01 arch=(x86_64) @@ -28,12 +28,13 @@ groups=(qt6) #options=(debug) # uncomment this to have qt6-base-debug produced _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz - qmake-cflags.patch - qmake-config.patch) + qt6-base-cflags.patch + qt6-base-nostrip.patch) prepare() { - patch -d $_pkgfn -p1 < qmake-cflags.patch # Use system CFLAGS - patch -d $_pkgfn -p1 < qmake-config.patch # Don't strip binaries with qmake and use -ltcg, cf. QTBUG-73834 + patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS + patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake + } build() { @@ -53,6 +54,7 @@ build() { -DQT_FEATURE_systemd=OFF \ -DQT_FEATURE_openssl_linked=ON \ -DQT_FEATURE_system_sqlite=ON \ + -DQT_FEATURE_system_xcb_xinput=ON \ -DQT_FEATURE_zstd=OFF \ -DQT_FEATURE_IPv6_ifname=OFF \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON @@ -78,6 +80,6 @@ package() { license=(GPL3 LGPL3 FDL custom) -sha256sums=(d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634 # qtbase-everywhere-src-6.2.4.tar.xz - 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qmake-cflags.patch - 4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch +sha256sums=(b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99 # qtbase-everywhere-src-6.3.0.tar.xz + 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qt6-base-cflags.patch + 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094) # qt6-base-nostrip.patch diff --git a/qt6-base/PKGBUILD-arch b/qt6-base/PKGBUILD-arch index 2ee6ba0..937ea28 100644 --- a/qt6-base/PKGBUILD-arch +++ b/qt6-base/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino pkgname=qt6-base -_qtver=6.2.4 +_qtver=6.3.0 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -25,17 +25,17 @@ optdepends=('qt6-wayland: to run Qt6 applications in a Wayland session' 'perl: for syncqt') groups=(qt6) options=(debug) -_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" +_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz - qmake-cflags.patch - qmake-config.patch) -sha256sums=('d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634' + qt6-base-cflags.patch + qt6-base-nostrip.patch) +sha256sums=('b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99' '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' - '4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa') + '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') prepare() { - patch -d $_pkgfn -p1 < qmake-cflags.patch # Use system CFLAGS - patch -d $_pkgfn -p1 < qmake-config.patch # Don't strip binaries with qmake and use -ltcg, cf. QTBUG-73834 + patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS + patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake } build() { @@ -54,6 +54,7 @@ build() { -DQT_FEATURE_journald=ON \ -DQT_FEATURE_openssl_linked=ON \ -DQT_FEATURE_system_sqlite=ON \ + -DQT_FEATURE_system_xcb_xinput=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON cmake --build build } diff --git a/qt6-base/qt6-base-cflags.patch b/qt6-base/qt6-base-cflags.patch index c33aa78..3325016 100644 --- a/qt6-base/qt6-base-cflags.patch +++ b/qt6-base/qt6-base-cflags.patch @@ -23,8 +23,8 @@ index 1f919d270a..7ef6046326 100644 -QMAKE_CFLAGS_DEBUG += -g +SYSTEM_CFLAGS = $$(CFLAGS) +SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS) -+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE } -+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g } ++!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE } ++!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g } +!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g } QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC @@ -38,8 +38,8 @@ index 1f919d270a..7ef6046326 100644 -QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG +SYSTEM_CXXFLAGS = $$(CXXFLAGS) +SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS) -+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE } -+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g } ++!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE } ++!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g } +!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g } QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB