Compare commits

..

No commits in common. "master" and "update/own" have entirely different histories.

380 changed files with 825 additions and 1268 deletions

View File

@ -9,7 +9,7 @@ pkgrel=3
pkgdesc='Source code formatter for CMake listfiles'
arch=('any')
url='https://github.com/cheshirekow/cmake_format'
license=('GPL-3.0-or-later')
license=('GPL3')
depends=('python-six>=1.13.0')
makedepends=('python-setuptools')
optdepends=('python-yaml>=5.3: YAML config files' 'python-jinja>=2.10.3: complete HTML annotation' 'python-argcomplete: automatic shell completion')

View File

@ -14,7 +14,7 @@
_android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %>
pkgname=<%= $package_name %>
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -45,7 +45,7 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"\
% }
<%== include 'fragments/source_file_list', relevant_files => $patch_files %>)
% if ($qt_module_sha256 =~ qr/missing/) {
% if ($kde_fork_revision || stash('is_lts')) {
sha256sums=('SKIP'\
% } else {
sha256sums=('<%== $qt_module_sha256 %>'\

View File

@ -14,7 +14,7 @@
% }
pkgname=<%= $package_name %>
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -38,13 +38,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
sha256sums=('<%== $qt_module_sha256 %>'\
<%== include 'fragments/sha256_list', relevant_files => $patch_files %>)
# disable i686 build because 32-bit Windows is generally not supported by upstream and
# it does not build anymore as of GCC 14 (probably due to commit 9a19fa8b616f83474c35cc5b34a3865073ced829)
# remarks:
# - This is in-line with MSYS2's packaging of mingw-w64 Qt 6 packages.
# - You may override MINGW_W64_QT6_ARCHS by adding the variable to `/etc/makepkg.conf` in case you
# nevertheless want to attempt the i686 build.
_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
% if ($patch_files->size || content_for('prepare')->size) {
prepare () {

View File

@ -15,7 +15,7 @@ _pkgfqn="qt<%== $qt_module %>-everywhere-src-${_qtver}"
sha256sums=('<%== stash('git_commit') ? 'SKIP' : $qt_module_sha256 %>'\
<%== include 'fragments/sha256_list', relevant_files => $patch_files %>)
_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
% if ($patch_files->size || content_for('prepare')->size) {
prepare () {

View File

@ -13,7 +13,7 @@
% }
pkgname=<%= $package_name %>
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -14,7 +14,7 @@ declare -A versions=(
[dbus-soundrecorder]=1.2.3
[geocoordinatecalculator]=1.1.3
[qt5]=5.15.13
[qt6]=6.7.1
[qt6]=6.7.0
)
declare -A github_names=(
[c++utilities]=cpp-utilities

View File

@ -1,319 +0,0 @@
2024-05-08 Jakub Jelinek <jakub@redhat.com>
PR target/114968
gcc/
* target.def (use_atexit_for_cxa_atexit): Remove spurious space
from comment.
(adjust_cdtor_callabi_fntype): New cxx target hook.
* targhooks.h (default_cxx_adjust_cdtor_callabi_fntype): Declare.
* targhooks.cc (default_cxx_adjust_cdtor_callabi_fntype): New
function.
* doc/tm.texi.in (TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE): Add.
* doc/tm.texi: Regenerate.
* config/i386/i386.cc (ix86_cxx_adjust_cdtor_callabi_fntype): New
function.
(TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE): Redefine.
gcc/cp/
* cp-tree.h (atexit_fn_ptr_type_node, cleanup_type): Adjust macro
comments.
(get_cxa_atexit_fn_ptr_type): Declare.
* decl.cc (get_atexit_fn_ptr_type): Adjust function comment, only
build type for atexit argument.
(get_cxa_atexit_fn_ptr_type): New function.
(get_atexit_node): Call get_cxa_atexit_fn_ptr_type rather than
get_atexit_fn_ptr_type when using __cxa_atexit.
(get_thread_atexit_node): Call get_cxa_atexit_fn_ptr_type
rather than get_atexit_fn_ptr_type.
(start_cleanup_fn): Add fntype argument, don't call
get_atexit_fn_ptr_type for it.
(register_dtor_fn): Adjust start_cleanup_fn caller, use
get_cxa_atexit_fn_ptr_type rather than get_atexit_fn_ptr_type
when ob_parm is true.
* except.cc (build_throw): Use get_cxa_atexit_fn_ptr_type ().
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -6498,7 +6498,7 @@ is in effect. The default is to return
hook_bool_void_false)
/* Returns true if target may use atexit in the same manner as
- __cxa_atexit to register static destructors. */
+ __cxa_atexit to register static destructors. */
DEFHOOK
(use_atexit_for_cxa_atexit,
"This hook returns true if the target @code{atexit} function can be used\n\
@@ -6509,6 +6509,17 @@ unloaded. The default is to return false
bool, (void),
hook_bool_void_false)
+/* Returns modified FUNCTION_TYPE for cdtor callabi. */
+DEFHOOK
+(adjust_cdtor_callabi_fntype,
+ "This hook returns a possibly modified @code{FUNCTION_TYPE} for arguments\n\
+to @code{__cxa_atexit}, @code{__cxa_thread_atexit} or @code{__cxa_throw}\n\
+function pointers. ABIs like mingw32 require special attributes to be added\n\
+to function types pointed to by arguments of these functions.\n\
+The default is to return the passed argument unmodified.",
+ tree, (tree fntype),
+ default_cxx_adjust_cdtor_callabi_fntype)
+
DEFHOOK
(adjust_class_at_definition,
"@var{type} is a C++ class (i.e., RECORD_TYPE or UNION_TYPE) that has just\n\
--- a/gcc/targhooks.h
+++ b/gcc/targhooks.h
@@ -65,6 +65,7 @@ extern machine_mode default_mode_for_suf
extern tree default_cxx_guard_type (void);
extern tree default_cxx_get_cookie_size (tree);
+extern tree default_cxx_adjust_cdtor_callabi_fntype (tree);
extern bool hook_pass_by_reference_must_pass_in_stack
(cumulative_args_t, const function_arg_info &);
--- a/gcc/targhooks.cc
+++ b/gcc/targhooks.cc
@@ -329,6 +329,14 @@ default_cxx_get_cookie_size (tree type)
return cookie_size;
}
+/* Returns modified FUNCTION_TYPE for cdtor callabi. */
+
+tree
+default_cxx_adjust_cdtor_callabi_fntype (tree fntype)
+{
+ return fntype;
+}
+
/* Return true if a parameter must be passed by reference. This version
of the TARGET_PASS_BY_REFERENCE hook uses just MUST_PASS_IN_STACK. */
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -7223,6 +7223,8 @@ floating-point support; they are not inc
@hook TARGET_CXX_USE_ATEXIT_FOR_CXA_ATEXIT
+@hook TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE
+
@hook TARGET_CXX_ADJUST_CLASS_AT_DEFINITION
@hook TARGET_CXX_DECL_MANGLING_CONTEXT
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -11117,6 +11117,14 @@ shared libraries are run in the correct
unloaded. The default is to return false.
@end deftypefn
+@deftypefn {Target Hook} tree TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE (tree @var{fntype})
+This hook returns a possibly modified @code{FUNCTION_TYPE} for arguments
+to @code{__cxa_atexit}, @code{__cxa_thread_atexit} or @code{__cxa_throw}
+function pointers. ABIs like mingw32 require special attributes to be added
+to function types pointed to by arguments of these functions.
+The default is to return the passed argument unmodified.
+@end deftypefn
+
@deftypefn {Target Hook} void TARGET_CXX_ADJUST_CLASS_AT_DEFINITION (tree @var{type})
@var{type} is a C++ class (i.e., RECORD_TYPE or UNION_TYPE) that has just
been defined. Use this hook to make adjustments to the class (eg, tweak
--- a/gcc/config/i386/i386.cc
+++ b/gcc/config/i386/i386.cc
@@ -25799,6 +25799,20 @@ ix86_bitint_type_info (int n, struct bit
return true;
}
+/* Returns modified FUNCTION_TYPE for cdtor callabi. */
+tree
+ix86_cxx_adjust_cdtor_callabi_fntype (tree fntype)
+{
+ if (TARGET_64BIT
+ || TARGET_RTD
+ || ix86_function_type_abi (fntype) != MS_ABI)
+ return fntype;
+ /* For 32-bit MS ABI add thiscall attribute. */
+ tree attribs = tree_cons (get_identifier ("thiscall"), NULL_TREE,
+ TYPE_ATTRIBUTES (fntype));
+ return build_type_attribute_variant (fntype, attribs);
+}
+
/* Implement PUSH_ROUNDING. On 386, we have pushw instruction that
decrements by exactly 2 no matter what the position was, there is no pushb.
@@ -26410,6 +26424,8 @@ static const scoped_attribute_specs *con
#define TARGET_C_EXCESS_PRECISION ix86_get_excess_precision
#undef TARGET_C_BITINT_TYPE_INFO
#define TARGET_C_BITINT_TYPE_INFO ix86_bitint_type_info
+#undef TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE
+#define TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE ix86_cxx_adjust_cdtor_callabi_fntype
#undef TARGET_PROMOTE_PROTOTYPES
#define TARGET_PROMOTE_PROTOTYPES hook_bool_const_tree_true
#undef TARGET_PUSH_ARGUMENT
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -368,8 +368,7 @@ extern GTY(()) tree cp_global_trees[CPTI
#define throw_fn cp_global_trees[CPTI_THROW_FN]
#define rethrow_fn cp_global_trees[CPTI_RETHROW_FN]
-/* The type of the function-pointer argument to "__cxa_atexit" (or
- "std::atexit", if "__cxa_atexit" is not being used). */
+/* The type of the function-pointer argument to "std::atexit". */
#define atexit_fn_ptr_type_node cp_global_trees[CPTI_ATEXIT_FN_PTR_TYPE]
/* A pointer to `std::atexit'. */
@@ -384,7 +383,8 @@ extern GTY(()) tree cp_global_trees[CPTI
/* The declaration of the dynamic_cast runtime. */
#define dynamic_cast_node cp_global_trees[CPTI_DCAST]
-/* The type of a destructor. */
+/* The type of a destructor, passed to __cxa_atexit, __cxa_thread_atexit
+ or __cxa_throw. */
#define cleanup_type cp_global_trees[CPTI_CLEANUP_TYPE]
/* The type of the vtt parameter passed to subobject constructors and
@@ -7067,6 +7067,7 @@ extern tree check_default_argument (tre
extern int wrapup_namespace_globals ();
extern tree create_implicit_typedef (tree, tree);
extern int local_variable_p (const_tree);
+extern tree get_cxa_atexit_fn_ptr_type ();
extern tree register_dtor_fn (tree);
extern tmpl_spec_kind current_tmpl_spec_kind (int);
extern tree cxx_builtin_function (tree decl);
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -93,7 +93,7 @@ static void record_key_method_defined (t
static tree create_array_type_for_decl (tree, tree, tree, location_t);
static tree get_atexit_node (void);
static tree get_dso_handle_node (void);
-static tree start_cleanup_fn (void);
+static tree start_cleanup_fn (tree);
static void end_cleanup_fn (void);
static tree cp_make_fname_decl (location_t, tree, int);
static void initialize_predefined_identifiers (void);
@@ -9678,34 +9678,39 @@ declare_global_var (tree name, tree type
return decl;
}
-/* Returns the type for the argument to "__cxa_atexit" (or "atexit",
- if "__cxa_atexit" is not being used) corresponding to the function
+/* Returns the type for the argument to "atexit" corresponding to the function
to be called when the program exits. */
static tree
-get_atexit_fn_ptr_type (void)
+get_atexit_fn_ptr_type ()
{
- tree fn_type;
-
if (!atexit_fn_ptr_type_node)
{
- tree arg_type;
- if (flag_use_cxa_atexit
- && !targetm.cxx.use_atexit_for_cxa_atexit ())
- /* The parameter to "__cxa_atexit" is "void (*)(void *)". */
- arg_type = ptr_type_node;
- else
- /* The parameter to "atexit" is "void (*)(void)". */
- arg_type = NULL_TREE;
-
- fn_type = build_function_type_list (void_type_node,
- arg_type, NULL_TREE);
+ tree fn_type = build_function_type_list (void_type_node, NULL_TREE);
atexit_fn_ptr_type_node = build_pointer_type (fn_type);
}
return atexit_fn_ptr_type_node;
}
+/* Returns the type for the argument to "__cxa_atexit", "__cxa_thread_atexit"
+ or "__cxa_throw" corresponding to the destructor to be called when the
+ program exits. */
+
+tree
+get_cxa_atexit_fn_ptr_type ()
+{
+ if (!cleanup_type)
+ {
+ tree fntype = build_function_type_list (void_type_node,
+ ptr_type_node, NULL_TREE);
+ fntype = targetm.cxx.adjust_cdtor_callabi_fntype (fntype);
+ cleanup_type = build_pointer_type (fntype);
+ }
+
+ return cleanup_type;
+}
+
/* Returns a pointer to the `atexit' function. Note that if
FLAG_USE_CXA_ATEXIT is nonzero, then this will actually be the new
`__cxa_atexit' function specified in the IA64 C++ ABI. */
@@ -9736,7 +9741,7 @@ get_atexit_node (void)
use_aeabi_atexit = targetm.cxx.use_aeabi_atexit ();
/* First, build the pointer-to-function type for the first
argument. */
- fn_ptr_type = get_atexit_fn_ptr_type ();
+ fn_ptr_type = get_cxa_atexit_fn_ptr_type ();
/* Then, build the rest of the argument types. */
argtype2 = ptr_type_node;
if (use_aeabi_atexit)
@@ -9819,7 +9824,7 @@ get_thread_atexit_node (void)
int __cxa_thread_atexit (void (*)(void *), void *, void *) */
tree fn_type = build_function_type_list (integer_type_node,
- get_atexit_fn_ptr_type (),
+ get_cxa_atexit_fn_ptr_type (),
ptr_type_node, ptr_type_node,
NULL_TREE);
@@ -9866,7 +9871,7 @@ get_dso_handle_node (void)
static GTY(()) int start_cleanup_cnt;
static tree
-start_cleanup_fn (void)
+start_cleanup_fn (tree fntype)
{
char name[32];
@@ -9878,7 +9883,6 @@ start_cleanup_fn (void)
/* Build the name of the function. */
sprintf (name, "__tcf_%d", start_cleanup_cnt++);
/* Build the function declaration. */
- tree fntype = TREE_TYPE (get_atexit_fn_ptr_type ());
tree fndecl = build_lang_decl (FUNCTION_DECL, get_identifier (name), fntype);
DECL_CONTEXT (fndecl) = FROB_CONTEXT (current_namespace);
/* It's a function with internal linkage, generated by the
@@ -9968,8 +9972,10 @@ register_dtor_fn (tree decl)
build_cleanup (decl);
/* Now start the function. */
- cleanup = start_cleanup_fn ();
-
+ cleanup = start_cleanup_fn (TREE_TYPE (ob_parm
+ ? get_cxa_atexit_fn_ptr_type ()
+ : get_atexit_fn_ptr_type ()));
+
/* Now, recompute the cleanup. It may contain SAVE_EXPRs that refer
to the original function, rather than the anonymous one. That
will make the back end think that nested functions are in use,
@@ -9998,7 +10004,8 @@ register_dtor_fn (tree decl)
{
/* We must convert CLEANUP to the type that "__cxa_atexit"
expects. */
- cleanup = build_nop (get_atexit_fn_ptr_type (), cleanup);
+ cleanup = build_nop (ob_parm ? get_cxa_atexit_fn_ptr_type ()
+ : get_atexit_fn_ptr_type (), cleanup);
/* "__cxa_atexit" will pass the address of DECL to the
cleanup function. */
mark_used (decl);
--- a/gcc/cp/except.cc
+++ b/gcc/cp/except.cc
@@ -645,11 +645,7 @@ build_throw (location_t loc, tree exp, t
/* The CLEANUP_TYPE is the internal type of a destructor. */
if (!cleanup_type)
- {
- tree tmp = build_function_type_list (void_type_node,
- ptr_type_node, NULL_TREE);
- cleanup_type = build_pointer_type (tmp);
- }
+ cleanup_type = get_cxa_atexit_fn_ptr_type ();
if (!throw_fn)
{

View File

@ -1,8 +1,8 @@
# Maintainer of official package: Felix Yan <felixonmars@archlinux.org>
pkgname=mingw-w64-gcc
pkgver=14.1.1+r1+g43b730b9134
pkgrel=2
pkgver=13.2.1
pkgrel=1
pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
arch=('x86_64' 'aarch64')
url="https://gcc.gnu.org"
@ -12,15 +12,14 @@ depends=('zlib' 'libisl' 'libmpc' 'mingw-w64-crt' 'mingw-w64-binutils' 'mingw-w6
# gcc-d doesn't build as of 13.1.0
makedepends=("gcc-ada" "git")
options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
_commit=43b730b9134af60a8f1c5b107d625f7127ff23c5
source=(git+https://sourceware.org/git/gcc.git#commit=${_commit}
0001-missing-__thiscall-attribute-on-builtin-declaration-of-__cxa_thread_atexit.patch)
_commit=d8a0dcd146dd95e2b6b85cf82c445214d364cf3b
source=(git+https://sourceware.org/git/gcc.git#commit=${_commit})
#source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig})
validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.org
86CFFCA918CF3AF47147588051E8B148A9999C34 # evangelos@foutrelis.com
13975A70E63C361C73AE69EF6EEB81F8981C74C7 # richard.guenther@gmail.com
D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62) # Jakub Jelinek <jakub@redhat.com>
sha512sums=('SKIP' 'SKIP')
sha512sums=('SKIP')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@ -28,17 +27,11 @@ prepare() {
ln -sf gcc-${pkgver/+/-} gcc
cd gcc
patch -p1 -i "$srcdir/0001-missing-__thiscall-attribute-on-builtin-declaration-of-__cxa_thread_atexit.patch"
# mmapio.c:69:14: error: implicit declaration of function getpagesize
sed -i 's|\-Werror||g' libbacktrace/configure
}
build() {
# Avoid errors due to implicit function declarations and similar issues (which are treated as errors as of GCC 14,
# see https://gcc.gnu.org/gcc-14/porting_to.html)
export CFLAGS_FOR_TARGET=-fpermissive
for _arch in ${_architectures}; do
mkdir -p "$srcdir"/build-${_arch} && cd "$srcdir"/build-${_arch}
"$srcdir"/gcc/configure --prefix=/usr --libexecdir=/usr/lib \
@ -62,7 +55,7 @@ package() {
make DESTDIR="$pkgdir" install
${_arch}-strip "$pkgdir"/usr/${_arch}/lib/*.dll
strip "$pkgdir"/usr/bin/${_arch}-*
strip "$pkgdir"/usr/lib/gcc/${_arch}/*/{cc1*,collect2,gnat1,f951,lto*}
strip "$pkgdir"/usr/lib/gcc/${_arch}/${pkgver}/{cc1*,collect2,gnat1,f951,lto*}
ln -s ${_arch}-gcc "$pkgdir"/usr/bin/${_arch}-cc
# mv dlls
mkdir -p "$pkgdir"/usr/${_arch}/bin/

View File

@ -1,8 +1,8 @@
# toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc
# NOTE: libtool requires rebuilt with each new gcc version
pkgname=({gcc,gcc-libs,lib32-gcc-libs,gcc-fortran}-static-compat)
pkgver=14.1.1+r1+g43b730b9134
pkgname=({gcc,gcc-libs,lib32-gcc-libs,gcc-ada,gcc-fortran}-static-compat)
pkgver=13.2.1
_majorver=${pkgver%%.*}
pkgrel=1
pkgdesc='The GNU Compiler Collection'
@ -32,10 +32,11 @@ checkdepends=(
options=(!emptydirs !lto debug)
_prefix=/usr/static-compat
_libdir=usr/static-compat/lib/gcc/$CHOST/${pkgver%%+*}
_commit=43b730b9134af60a8f1c5b107d625f7127ff23c5
source=(git+https://sourceware.org/git/gcc.git#commit=$_commit
_commit=d8a0dcd146dd95e2b6b85cf82c445214d364cf3b
source=(git://gcc.gnu.org/git/gcc.git#commit=$_commit
#source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz{,.sig}
c89 c99
gcc-ada-repro.patch
)
validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.org
86CFFCA918CF3AF47147588051E8B148A9999C34 # evangelos@foutrelis.com
@ -45,7 +46,8 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.
# 'SKIP'
sha256sums=('SKIP'
'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
'2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a')
'2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
'1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f')
prepare() {
[[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
@ -59,6 +61,9 @@ prepare() {
sed -i 's|MULTILIB_DIRNAMES .*|MULTILIB_DIRNAMES = 64 32|' gcc/config/i386/t-linux64
sed -i 's|m32=.*|m32=../lib32\$\(call if_multiarch,:i386-linux-gnu\)|' gcc/config/i386/t-linux64
# Reproducible gcc-ada
patch -Np0 < "$srcdir/gcc-ada-repro.patch"
mkdir -p "$srcdir/gcc-build"
}
@ -118,9 +123,16 @@ build() {
CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2}
"$srcdir/gcc/configure" \
--enable-languages=c,c++,fortran,lto \
--enable-languages=ada,c,c++,fortran,lto \
$_confflags
# link Ada host tools with host g++ - otherwise we run into linker errors because it would use the too old target glibc
# note: Since we don't need Ada anyways it maybe makes sense to just disable it in the future.
sed -i -r \
-e 's|\+\$\(GCC_LINK\)( .* \$\(TOOLS_LIBS\))|g++\1|g' \
-e 's|--LINK=\"\$\(GCC_LINK\)\"|--LINK=g++|g' \
gcc/ada/gcc-interface/Makefile
make
}
@ -155,6 +167,7 @@ package_gcc-libs-static-compat() {
make -C $CHOST/$lib DESTDIR="$pkgdir" install-toolexeclibLTLIBRARIES
done
#make -C $CHOST/libobjc DESTDIR="$pkgdir" install-libs
make -C $CHOST/libstdc++-v3/po DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/$_libdir/include/d/
@ -230,7 +243,7 @@ package_gcc-static-compat() {
make -C gcc DESTDIR="$pkgdir" install-man install-info
rm "$pkgdir"$_prefix/share/man/man1/gfortran.1
rm "$pkgdir"$_prefix/share/info/gfortran.info
rm "$pkgdir"$_prefix/share/info/{gfortran,gnat-style,gnat_rm,gnat_ugn}.info
rm -r "$pkgdir"$_prefix/share/info/dir
make -C libcpp DESTDIR="$pkgdir" install
@ -281,6 +294,44 @@ package_gcc-fortran-static-compat() {
"$pkgdir$_prefix/share/licenses/$pkgname/"
}
package_gcc-ada-static-compat() {
pkgdesc='Ada front-end for GCC (GNAT)'
depends=("gcc-static-compat=$pkgver-$pkgrel" libisl.so)
options=(!emptydirs staticlibs debug)
cd gcc-build/gcc
make DESTDIR="$pkgdir" ada.install-{common,info}
install -m755 gnat1 "$pkgdir/${_libdir}"
cd "$srcdir"/gcc-build/$CHOST/libada
make DESTDIR="${pkgdir}" INSTALL="install" \
INSTALL_DATA="install -m644" install-libada
cd "$srcdir"/gcc-build/$CHOST/32/libada
make DESTDIR="${pkgdir}" INSTALL="install" \
INSTALL_DATA="install -m644" install-libada
ln -s gcc "$pkgdir$_prefix/bin/gnatgcc"
# insist on dynamic linking, but keep static libraries because gnatmake complains
mv "$pkgdir"/${_libdir}/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir$_prefix/lib"
ln -s libgnarl-${_majorver}.so "$pkgdir$_prefix/lib/libgnarl.so"
ln -s libgnat-${_majorver}.so "$pkgdir$_prefix/lib/libgnat.so"
rm -f "$pkgdir"/${_libdir}/adalib/libgna{rl,t}.so
rm -r "$pkgdir"$_prefix/share/info/dir
install -d "$pkgdir$_prefix/lib32/"
mv "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir$_prefix/lib32"
ln -s libgnarl-${_majorver}.so "$pkgdir$_prefix/lib32/libgnarl.so"
ln -s libgnat-${_majorver}.so "$pkgdir$_prefix/lib32/libgnat.so"
rm -f "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}.so
# Install Runtime Library Exception
install -d "$pkgdir$_prefix/share/licenses/$pkgname/"
ln -s $_prefix/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
"$pkgdir$_prefix/share/licenses/$pkgname/"
}
package_lib32-gcc-libs-static-compat() {
pkgdesc='32-bit runtime libraries shipped by GCC'
depends=('lib32-glibc>=2.26')

View File

@ -1,70 +1,77 @@
# Maintainer: pingplug < aur at pingplug dot me >
# Contributor: Schala Zeal < schalaalexiazeal at gmail dot com >
_commit=9aa6f8a93f035dd0a1e3978da495d830049480c8 # tags/2.9.0
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
pkgbase=mingw-w64-harfbuzz
pkgname=('mingw-w64-harfbuzz' 'mingw-w64-harfbuzz-icu')
pkgver=8.4.0
pkgrel=2
pkgver=2.9.0
pkgrel=1
pkgdesc="OpenType text shaping engine (mingw-w64)"
arch=('any')
url="https://harfbuzz.github.io/"
url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
license=('MIT')
depends=('mingw-w64-crt'
'mingw-w64-glib2'
'mingw-w64-graphite'
'mingw-w64-freetype2')
makedepends=('mingw-w64-meson'
makedepends=('mingw-w64-configure'
'mingw-w64-cairo'
'mingw-w64-icu'
'python'
'gtk-doc'
'ragel'
'git')
options=('!strip' 'staticlibs' '!buildflags')
source=("git+https://github.com/harfbuzz/harfbuzz?signed#tag=$pkgver")
b2sums=('19f25dbf2ba6d90fdbb4ecb1039c8d0d72c55cff3dc3b30d6b75b626c15bf28a2118495837d80b7f622f0929dd7d4a07b5526963e1204bb9c90bc9f976c26977')
validpgpkeys=(
053D20F17CCCA9651B2C6FCB9AB24930C0B997A2 # Khaled Hosny <khaled@aliftype.com> (@khaledhosny)
9F377DDB6D3153A48EB3EB1E63CC496475267693 # Caleb Maclennan <caleb@alerque.com> (@alerque)
2277650A4E8BDFE4B7F6BE419FEE04E5D3531115 # Ebrahim Byagowi <ebrahim@gnu.org> (@ebraminio)
EACF64F53455E2771BA661A4803B21859F015E4E # Behdad Esfahbod <behdad@behdad.org> (@behdad)
)
source=("git+https://github.com/harfbuzz/harfbuzz.git#commit=${_commit}")
sha256sums=('SKIP')
pkgver() {
cd harfbuzz
git describe --tags | sed 's/-/+/g'
}
prepare() {
cd harfbuzz
# disable tests (thanks to chenxiaolong)
sed -i '/SUBDIRS/s/test//' Makefile.am
NOCONFIGURE=1 ./autogen.sh
}
build() {
cd harfbuzz
for _arch in ${_architectures}; do
mkdir -p build-${_arch}-shared && pushd build-${_arch}-shared
${_arch}-meson \
-D b_lto=false \
-D graphite=enabled \
-D tests=disabled \
-D docs=disabled \
-D cpp_std=c++17 \
..
# fix linker selection error
sed -i 's|: c_LINKER|: cpp_LINKER|g' build.ninja
ninja
popd
# Build static and shared libs separately due to necessity of defining DGRAPHITE2_STATIC
# manually when building static version
# static build
mkdir -p build-${_arch}-static && pushd build-${_arch}-static
${_arch}-meson \
--default-library static \
-D c_args=-DGRAPHITE2_STATIC \
-D cpp_args=-DGRAPHITE2_STATIC \
-D b_lto=false \
-D graphite=enabled \
-D tests=disabled \
-D docs=disabled \
-D cpp_std=c++17 \
..
# fix linker selection error
sed -i 's|: c_LINKER|: cpp_LINKER|g' build.ninja
ninja
CFLAGS="${CFLAGS} -DGRAPHITE2_STATIC" \
CXXFLAGS="${CXXFLAGS} -DGRAPHITE2_STATIC" \
${_arch}-configure \
--with-glib \
--with-freetype \
--with-cairo \
--with-icu \
--with-gobject \
--with-graphite2 \
--enable-static=yes \
--enable-shared=no
make
popd
# shared build
mkdir -p build-${_arch}-shared && pushd build-${_arch}-shared
LDFLAGS=-lssp ${_arch}-configure \
--with-glib \
--with-freetype \
--with-cairo \
--with-icu \
--with-gobject \
--with-graphite2 \
--enable-static=no \
--enable-shared=yes
make
popd
done
}
@ -72,13 +79,12 @@ build() {
package_mingw-w64-harfbuzz() {
for _arch in ${_architectures}; do
cd "${srcdir}/harfbuzz/build-${_arch}-static"
DESTDIR="${pkgdir}" ninja install
make DESTDIR="${pkgdir}" install
cd "${srcdir}/harfbuzz/build-${_arch}-shared"
DESTDIR="${pkgdir}" ninja install
cp "${srcdir}/harfbuzz/src/hb-ft.h" "${pkgdir}/usr/${_arch}/include/harfbuzz/"
make DESTDIR="${pkgdir}" install
find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec rm {} \;
find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" -name '*.a' | xargs ${_arch}-strip -g
find "${pkgdir}/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
mkdir -p hb-icu/usr/${_arch}/{bin,include/harfbuzz,lib/pkgconfig}; cd hb-icu
mv "${pkgdir}"/usr/${_arch}/bin/libharfbuzz-icu* ./usr/${_arch}/bin

View File

@ -8,7 +8,7 @@ pkgname=mingw-w64-passwordmanager-qt6
_name=${pkgname#mingw-w64-}
_name=${_name%-qt6}
pkgver=4.2.0
pkgrel=2
pkgrel=1
arch=('any')
pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64)'
license=('GPL')
@ -19,7 +19,7 @@ source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/arc
sha256sums=('018dc831794182a66f4820ede7e399cee7633107542451206062bb01500541e0')
options=(!buildflags staticlibs !strip !emptydirs)
_architectures=(${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32})
_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
_configurations=()
[[ $NO_SHARED_LIBS ]] || _configurations+=('shared')
[[ $NO_STATIC_LIBS ]] || _configurations+=('static') makedepends+=('mingw-w64-cmake-static' 'mingw-w64-qt6-base-static' 'mingw-w64-qt6-translations' 'mingw-w64-qt6-svg-static' 'breeze-icons' 'numix-icon-theme-git')

View File

@ -37,7 +37,7 @@ build() {
-DCMAKE_BUILD_TYPE:STRING='Release' \
-DCMAKE_INSTALL_PREFIX:PATH='/usr' \
-DCONFIGURATION_NAME:STRING="$_cfg" \
-DCONFIGURATION_DISPLAY_NAME="" \
-DCONFIGURATION_DISPLAY_NAME="Qt 6" \
-DCONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES:STRING="-$_cfg" \
-DPASSWORD_MANAGER_CONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \
-DQT_PACKAGE_PREFIX:STRING='Qt6' \

View File

@ -2,7 +2,7 @@ _pkgname='pianobooster'
pkgname='mingw-w64-pianobooster-custom'
pkgdesc='A MIDI file player that teaches you how to play the piano (mingw-w64, with custom and experimental patches, statically linked)'
pkgver=1392.86ce9b0
pkgrel=3
pkgrel=2
depends=()
makedepends=('mingw-w64-qt6-base-static' 'mingw-w64-ftgl' 'mingw-w64-fluidsynth' 'mingw-w64-qtutilities-qt6' 'mingw-w64-c++utilities'
'git' 'clang' 'qt6-declarative' 'qt6-tools' 'mingw-w64-cmake-static' 'mingw-w64-qt6-tools-static' 'mingw-w64-qt6-svg-static'
@ -15,7 +15,7 @@ source=("${_pkgname}::${MARTCHUS_GIT_URL_PREFIX:-git+https://github.com/Martchus
sha256sums=(SKIP)
options=(!buildflags staticlibs !strip !emptydirs)
_architectures=(${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32})
_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
pkgver() {
cd "${srcdir}/${_pkgname}"

View File

@ -0,0 +1 @@
cf08bc14ebdf811643a0d07e1d7168fdc2d46d40d95041d27707ddf51fcc6783

View File

@ -0,0 +1 @@
cf08bc14ebdf811643a0d07e1d7168fdc2d46d40d95041d27707ddf51fcc6783

View File

@ -0,0 +1 @@
c5a635be320e3ba9cbc20e04901f660d46541e4943a98cf2e5d42d0f09562c17

View File

@ -0,0 +1 @@
06e49a14145574834d4d04f73e6baf662ee5e72e78973e1d7d0fe614472a80a4

View File

@ -0,0 +1 @@
06e49a14145574834d4d04f73e6baf662ee5e72e78973e1d7d0fe614472a80a4

View File

@ -0,0 +1 @@
98b5b2a348ef6bd68b2b64eee48815ddfd785476f1cdc797179a68c32322f209

View File

@ -0,0 +1 @@
98b5b2a348ef6bd68b2b64eee48815ddfd785476f1cdc797179a68c32322f209

View File

@ -0,0 +1 @@
97c1e18cf0b58212900899793d4776cf35ddc64ec8863c104ef7b418cfc0b6d7

View File

@ -0,0 +1 @@
97c1e18cf0b58212900899793d4776cf35ddc64ec8863c104ef7b418cfc0b6d7

View File

@ -0,0 +1 @@
649c0c535c76f781aeda6a7a262904c71dd438e4a4762dd2e507f696544c8c35

View File

@ -0,0 +1 @@
649c0c535c76f781aeda6a7a262904c71dd438e4a4762dd2e507f696544c8c35

View File

@ -0,0 +1 @@
7ed5dd98f8123b7678d347ff6b55d7475a1af00b3f5d4d7476029c12a241df41

View File

@ -0,0 +1 @@
7ed5dd98f8123b7678d347ff6b55d7475a1af00b3f5d4d7476029c12a241df41

View File

@ -0,0 +1 @@
237516fccd6a7b3431d2860d6f6e36cc6be39eaa0f3ec968f084fa0f6b87d67c

View File

@ -0,0 +1 @@
237516fccd6a7b3431d2860d6f6e36cc6be39eaa0f3ec968f084fa0f6b87d67c

View File

@ -0,0 +1 @@
b20bc1219886877130e9ed907674ae8824a949b5ec3f53b4b1994c077e38b528

View File

@ -0,0 +1 @@
b20bc1219886877130e9ed907674ae8824a949b5ec3f53b4b1994c077e38b528

View File

@ -0,0 +1 @@
9246c13e0e7403c28b62986c30a4906830df40aa92ead228f85851de8312874f

View File

@ -0,0 +1 @@
9246c13e0e7403c28b62986c30a4906830df40aa92ead228f85851de8312874f

View File

@ -0,0 +1 @@
3454c9364fc70d3639ad447f46429ef78305b76b65e94f3ccaf2689b3f401e80

View File

@ -0,0 +1 @@
3454c9364fc70d3639ad447f46429ef78305b76b65e94f3ccaf2689b3f401e80

View File

@ -0,0 +1 @@
eef7a053fc4d4e33bdd1ae7dd0a2db32f755eacbf2e4a144246d33c3e02a0ab5

View File

@ -0,0 +1 @@
eef7a053fc4d4e33bdd1ae7dd0a2db32f755eacbf2e4a144246d33c3e02a0ab5

View File

@ -0,0 +1 @@
475fa3de48d02ac48e3a3b4c3cd0111f214070e2fbbb8a433f2ac09bb8a968ce

View File

@ -0,0 +1 @@
475fa3de48d02ac48e3a3b4c3cd0111f214070e2fbbb8a433f2ac09bb8a968ce

View File

@ -0,0 +1 @@
2be3bb711c2af466f9f171ae2a0fa1f0172acad0992c329380e7bd38155c641c

View File

@ -0,0 +1 @@
2be3bb711c2af466f9f171ae2a0fa1f0172acad0992c329380e7bd38155c641c

View File

@ -0,0 +1 @@
d288230b95dd12ba4d0f0cdd00f3964f093e2685a48f75e151c7899b4ab8b6ec

View File

@ -0,0 +1 @@
d288230b95dd12ba4d0f0cdd00f3964f093e2685a48f75e151c7899b4ab8b6ec

View File

@ -0,0 +1 @@
686ae571e32dac732903c8070a26867b19bf6d387c24cc6726aadabba286883b

View File

@ -0,0 +1 @@
686ae571e32dac732903c8070a26867b19bf6d387c24cc6726aadabba286883b

View File

@ -0,0 +1 @@
3e8214db546f139618ccf5ca561b70fcb4ae1c98976d4e58af5c4ca505e113a7

View File

@ -0,0 +1 @@
3e8214db546f139618ccf5ca561b70fcb4ae1c98976d4e58af5c4ca505e113a7

View File

@ -0,0 +1 @@
e73fd867f8b44713678e712f43d4d5a1c91080d6337f8ab9c657110d67ebfaf6

View File

@ -0,0 +1 @@
e73fd867f8b44713678e712f43d4d5a1c91080d6337f8ab9c657110d67ebfaf6

View File

@ -0,0 +1 @@
38eb6df8dc8c7346bec8a6e758c2798ff4a3547056c03189c9a6d4581fc9cd05

View File

@ -0,0 +1 @@
38eb6df8dc8c7346bec8a6e758c2798ff4a3547056c03189c9a6d4581fc9cd05

View File

@ -1,117 +0,0 @@
# Maintainer: Martchus <martchus@gmx.net>
# Contributor: Wolfgang Pupp <wolfgang.pupp@gmail.com>
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
# you also find the URL of a binary repository.
# This file is created from PKGBUILD.sh.ep contained by the mentioned repository.
# Do not edit it manually! See README.md in the repository's root directory
# for more information.
_qt_module=qtserialbus
pkgname=mingw-w64-qt5-serialbus-static
pkgver=5.15.13
pkgrel=1
arch=('any')
pkgdesc="Qt module for general purpose serial bus access (mingw-w64)"
depends=('mingw-w64-qt5-serialport-static')
makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
license=('GPL3' 'LGPL3' 'FDL' 'custom')
_commit=5efce7d821bad2f5db95ff3ada5eeddccbb58920
_basever=${pkgver%%+*}
makedepends+=('git')
options=('!strip' '!buildflags' 'staticlibs')
groups=('mingw-w64-qt5')
url='https://www.qt.io/'
_pkgfqn=${_qt_module}
source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
sha256sums=('64ac02bf05741e663d80daa0474a8ecbfe7fa416f5125a8c4373eb3544078031')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers
_configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static')
pkgver() {
cd $_pkgfqn
echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
}
prepare() {
cd "${srcdir}/${_pkgfqn}"
# don't build examples or tests
sed -i 's/ examples tests//' qtserialbus.pro
}
build() {
cd "${srcdir}/${_pkgfqn}"
for _arch in ${_architectures}; do
for _config in "${_configurations[@]}"; do
msg2 "Building ${_config##*=} version for ${_arch}"
mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args}
make
popd
done
done
}
package() {
cd "${srcdir}/${_pkgfqn}"
for _arch in ${_architectures}; do
for _config in "${_configurations[@]}"; do
pushd build-${_arch}-${_config##*=}
make INSTALL_ROOT="$pkgdir" install
# use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE
if [[ -d 'lib' ]]; then
pushd 'lib'
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib" --parents {} +
popd
fi
if [[ -d 'plugins' ]]; then
pushd 'plugins'
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib/qt/plugins" --parents {} +
popd
fi
# replace library path in *.prl files so it points to the installed location and not the build directory
find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:$PWD/lib:/usr/$_arch/lib:g" {} \;
# remove prl files for debug version
if ! [[ $MINGW_W64_QT_DEBUG_BUILD ]]; then
for file in $(find "${pkgdir}/usr/${_arch}" -name '*d.prl' -o -name '*d.static.prl'); do
[ -f "${file%d*}${file##*d}" ] && rm "${file}";
done
fi
# remove '.static.prl' files
find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete
# delete duplicate files that are in the shared package
find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete
for shared_path in "${pkgdir}/usr/${_arch}/"{include,share} "${pkgdir}/usr/${_arch}/lib/"{qt/bin,qt/mkspecs}; do
[[ -d $shared_path ]] && rm -fR "$shared_path"
done
for file in $(find "$pkgdir/usr/$_arch/lib"); do
[[ -f "${file##$pkgdir}" ]] && rm "$file"
done
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete
find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" \( -name '*.a' -not -name 'libQt5QmlDevTools.a' -not -name 'libQt5Bootstrap.a' \) -exec ${_arch}-strip -g {} \;
[[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \
find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
popd
done
# drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/${_arch}/lib" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
done
}

View File

@ -1 +0,0 @@
%= include "$default_package_name/mingw-w64/PKGBUILD";

View File

@ -1 +0,0 @@
64ac02bf05741e663d80daa0474a8ecbfe7fa416f5125a8c4373eb3544078031

View File

@ -1,109 +0,0 @@
# Maintainer: Martchus <martchus@gmx.net>
# Contributor: Wolfgang Pupp <wolfgang.pupp@gmail.com>
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
# you also find the URL of a binary repository.
# This file is created from PKGBUILD.sh.ep contained by the mentioned repository.
# Do not edit it manually! See README.md in the repository's root directory
# for more information.
_qt_module=qtserialbus
pkgname=mingw-w64-qt5-serialbus
pkgver=5.15.13
pkgrel=1
arch=('any')
pkgdesc="Qt module for general purpose serial bus access (mingw-w64)"
depends=('mingw-w64-qt5-serialport')
makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
license=('GPL3' 'LGPL3' 'FDL' 'custom')
_commit=5efce7d821bad2f5db95ff3ada5eeddccbb58920
_basever=${pkgver%%+*}
makedepends+=('git')
options=('!strip' '!buildflags' 'staticlibs')
groups=('mingw-w64-qt5')
url='https://www.qt.io/'
_pkgfqn=${_qt_module}
source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
sha256sums=('64ac02bf05741e663d80daa0474a8ecbfe7fa416f5125a8c4373eb3544078031')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
_configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
pkgver() {
cd $_pkgfqn
echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
}
prepare() {
cd "${srcdir}/${_pkgfqn}"
# don't build examples or tests
sed -i 's/ examples tests//' qtserialbus.pro
}
build() {
cd "${srcdir}/${_pkgfqn}"
for _arch in ${_architectures}; do
for _config in "${_configurations[@]}"; do
msg2 "Building ${_config##*=} version for ${_arch}"
mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args}
make
popd
done
done
}
package() {
cd "${srcdir}/${_pkgfqn}"
for _arch in ${_architectures}; do
for _config in "${_configurations[@]}"; do
pushd build-${_arch}-${_config##*=}
make INSTALL_ROOT="$pkgdir" install
# use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE
if [[ -d 'lib' ]]; then
pushd 'lib'
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib" --parents {} +
popd
fi
if [[ -d 'plugins' ]]; then
pushd 'plugins'
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib/qt/plugins" --parents {} +
popd
fi
# replace library path in *.prl files so it points to the installed location and not the build directory
find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:$PWD/lib:/usr/$_arch/lib:g" {} \;
# remove prl files for debug version
if ! [[ $MINGW_W64_QT_DEBUG_BUILD ]]; then
for file in $(find "${pkgdir}/usr/${_arch}" -name '*d.prl' -o -name '*d.static.prl'); do
[ -f "${file%d*}${file##*d}" ] && rm "${file}";
done
fi
# remove '.static.prl' files
find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete
[ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \
find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" \( -name '*.a' -not -name 'libQt5QmlDevTools.a' -not -name 'libQt5Bootstrap.a' \) -exec ${_arch}-strip -g {} \;
[[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \
find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
popd
done
# drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/${_arch}/lib" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
done
}

View File

@ -1,19 +0,0 @@
% layout 'mingw-w64-qt5-module';
\
% content_for additional_contributors => begin
# Contributor: Wolfgang Pupp <wolfgang.pupp@gmail.com>
% end
\
pkgver=5.15.13
pkgrel=1
arch=('any')
pkgdesc="Qt module for general purpose serial bus access (mingw-w64)"
depends=(<%== qt5deps qw(serialport) %>)
makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
license=('GPL3' 'LGPL3' 'FDL' 'custom')
\
% content_for prepare => begin
# don't build examples or tests
sed -i 's/ examples tests//' qtserialbus.pro
% end

View File

@ -1 +0,0 @@
64ac02bf05741e663d80daa0474a8ecbfe7fa416f5125a8c4373eb3544078031

View File

@ -0,0 +1 @@
41b87d6c4bd1975ee707a19c209310d8233db43232a1ade9cd4e360bf7a861ad

View File

@ -0,0 +1 @@
41b87d6c4bd1975ee707a19c209310d8233db43232a1ade9cd4e360bf7a861ad

View File

@ -0,0 +1 @@
67ded86b1764281213833d910c5771580087fc478c3bde99a9ed4ed555ca6db6

View File

@ -0,0 +1 @@
67ded86b1764281213833d910c5771580087fc478c3bde99a9ed4ed555ca6db6

View File

@ -0,0 +1 @@
01d1f07e2f1b3519c5c4de37cd79c360cc4e75f00d0a8866c14032ebcb183477

View File

@ -0,0 +1 @@
01d1f07e2f1b3519c5c4de37cd79c360cc4e75f00d0a8866c14032ebcb183477

View File

@ -0,0 +1 @@
52080466c7d03c6a6fd007940ed9cd42b2c73192ea2e76edf81619edff2adecf

View File

@ -0,0 +1 @@
52080466c7d03c6a6fd007940ed9cd42b2c73192ea2e76edf81619edff2adecf

View File

@ -0,0 +1 @@
a57dc54f83106ce0c9f4cb3a6101b55dfae107c1aff6589872738fd0b65bd56a

View File

@ -0,0 +1 @@
f7e2ef185a99fa29777b86022d1b8fe866588ad3f64b5abd6d462b4ea8b4bb09

View File

@ -0,0 +1 @@
f7e2ef185a99fa29777b86022d1b8fe866588ad3f64b5abd6d462b4ea8b4bb09

View File

@ -0,0 +1 @@
fd1e7f99e4aaffd78976f8ec913c598f23cf2d2b0ccdd1eb3d62761a66b2c42c

View File

@ -0,0 +1 @@
fd1e7f99e4aaffd78976f8ec913c598f23cf2d2b0ccdd1eb3d62761a66b2c42c

View File

@ -0,0 +1 @@
a6d7cd830f7ed5a0ab9faa1c38189f501450addeff723d0d37c6f3d1d779bdb7

View File

@ -0,0 +1 @@
a6d7cd830f7ed5a0ab9faa1c38189f501450addeff723d0d37c6f3d1d779bdb7

View File

@ -0,0 +1 @@
1d94d0f25f4d663fb7dfa80c2c1444b1bc871bdbf00ca18cdc381460cc8f9023

View File

@ -0,0 +1 @@
1d94d0f25f4d663fb7dfa80c2c1444b1bc871bdbf00ca18cdc381460cc8f9023

View File

@ -0,0 +1 @@
a489c58f1620d0cabc7c47343119a6881af9f47a832a3e98389952c3366cc29a

View File

@ -0,0 +1 @@
a489c58f1620d0cabc7c47343119a6881af9f47a832a3e98389952c3366cc29a

View File

@ -0,0 +1 @@
66bdf760b383818ae7644247b5b75463b8ffa142ba2a040c9b6e2ef464c3a94d

View File

@ -0,0 +1 @@
66bdf760b383818ae7644247b5b75463b8ffa142ba2a040c9b6e2ef464c3a94d

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-3d-static
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -21,7 +21,7 @@ _pkgfqn="qt3d-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('3362d01c7542af0e902908d2d339374feda1a037552ea625b900278982375c27')
_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
build() {
for _arch in ${_architectures}; do

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-3d
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -21,7 +21,7 @@ _pkgfqn="qt3d-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('0da87a46217f4d72f6d0de9768605d5325ef3d093f73a5e0d73dd88e99c1fc2a')
_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
build() {
for _arch in ${_architectures}; do

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', has_binaries => 1;
\
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-5compat
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(android-${_android_arch}-qt6)
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009')
sha256sums=('9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5')
build() {
export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH

View File

@ -1,6 +1,6 @@
% layout 'android-qt6-module';
\
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009
9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-5compat-static
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -17,9 +17,9 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009')
sha256sums=('9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5')
_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
build() {
for _arch in ${_architectures}; do

View File

@ -1 +1 @@
41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009
9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-5compat
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -17,9 +17,9 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009')
sha256sums=('9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5')
_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
build() {
for _arch in ${_architectures}; do

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module';
\
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009
9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=static-compat-qt6-5compat
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)
@ -17,7 +17,7 @@ makedepends=(static-compat-cmake static-compat-qt6-declarative static-compat-qt6
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009')
sha256sums=('9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5')
build() {
check_buildoption ccache y && ccache_args='

View File

@ -1,6 +1,6 @@
% layout 'static-compat-qt6-module';
\
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -1 +1 @@
41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009
9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-activeqt-static
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -21,12 +21,12 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
'0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
'0002-Build-tools-for-the-target-platform.patch'
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
sha256sums=('cb198721e143af497c23adee1644f6ba3c559ebf021dfcac76fe018a66b5a545'
'c645fab190a0fbb362bce5c687fdef5b76b1e962932663c75d107e10faf264b8'
'c8eb434aa7723fb1b9c4e6e5d5bba481b66363bda8eda20ecfee6c51d79e6e8a'
'fcd977d1f49ea9975c386471ccd265f040770355b4a1212aea5f2f1c06986b8d')
sha256sums=('450485a213fb479042c36e37bfa0f8f7fcff4cf54f053de9d4f226810834d0b3'
'd3b110227698adedd0d0299a7391c07d09d289c1904772fb6e88b551cf875d05'
'bc65d03b23c52b28b52e7476b373dbbdf32af7c510728f73dee187872e3b0105'
'0b27ecbba1123e349fce11f38dd68ce6addce4d1309568b52cb816324aae4974')
_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
prepare () {
cd $_pkgfqn

View File

@ -1 +1 @@
cb198721e143af497c23adee1644f6ba3c559ebf021dfcac76fe018a66b5a545
450485a213fb479042c36e37bfa0f8f7fcff4cf54f053de9d4f226810834d0b3

View File

@ -1,4 +1,4 @@
From 10b85d1aecaecb6afc96c0001bc159cb3e85250e Mon Sep 17 00:00:00 2001
From 867ab5872447b80d65ba4a9f116769cdf4016edb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 17:21:08 +0200
Subject: [PATCH 1/3] Handle win64 in dumpcpp and
@ -52,5 +52,5 @@ index 1b6fbeb..679bf9e 100644
}
--
2.45.1
2.44.0

View File

@ -1,4 +1,4 @@
From 906df87d766d2ead37a4e915731d85bcce4cbf7b Mon Sep 17 00:00:00 2001
From 5f481ba9c46843ba71d1135c948ef491bb4da6e6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 7 May 2021 16:10:47 +0200
Subject: [PATCH 2/3] Build tools for the target platform
@ -61,5 +61,5 @@ index 84b4018..1dc4b9e 100644
main.cpp
LIBRARIES
--
2.45.1
2.44.0

View File

@ -1,4 +1,4 @@
From ddab7c616dc45d5827bdbd8c78465575edc4ef0c Mon Sep 17 00:00:00 2001
From 33479fe078468b289b80aa4ea2e502e6c7bbf34d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 12 Sep 2022 17:38:47 +0200
Subject: [PATCH 3/3] Fix compile error about missing QStringView overload
@ -33,5 +33,5 @@ index 679bf9e..d73457a 100644
nextTypeAndForceComplete = startType + lengthType;
} while (true);
--
2.45.1
2.44.0

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-activeqt
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -21,12 +21,12 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
'0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
'0002-Build-tools-for-the-target-platform.patch'
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
sha256sums=('cb198721e143af497c23adee1644f6ba3c559ebf021dfcac76fe018a66b5a545'
'c645fab190a0fbb362bce5c687fdef5b76b1e962932663c75d107e10faf264b8'
'c8eb434aa7723fb1b9c4e6e5d5bba481b66363bda8eda20ecfee6c51d79e6e8a'
'fcd977d1f49ea9975c386471ccd265f040770355b4a1212aea5f2f1c06986b8d')
sha256sums=('450485a213fb479042c36e37bfa0f8f7fcff4cf54f053de9d4f226810834d0b3'
'd3b110227698adedd0d0299a7391c07d09d289c1904772fb6e88b551cf875d05'
'bc65d03b23c52b28b52e7476b373dbbdf32af7c510728f73dee187872e3b0105'
'0b27ecbba1123e349fce11f38dd68ce6addce4d1309568b52cb816324aae4974')
_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
prepare () {
cd $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', no_libs => 1;
\
_qtver=6.7.1
_qtver=6.7.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
cb198721e143af497c23adee1644f6ba3c559ebf021dfcac76fe018a66b5a545
450485a213fb479042c36e37bfa0f8f7fcff4cf54f053de9d4f226810834d0b3

Some files were not shown because too many files have changed in this diff Show More