diff options
Diffstat (limited to 'user')
65 files changed, 1766 insertions, 71 deletions
diff --git a/user/.rootbld-repositories b/user/.rootbld-repositories new file mode 100644 index 000000000..b8c131a9a --- /dev/null +++ b/user/.rootbld-repositories @@ -0,0 +1,2 @@ +https://distfiles.adelielinux.org/adelie/1.0-alpha6/system/ +https://distfiles.adelielinux.org/adelie/1.0-alpha6/user/ diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index 2c562f252..f2d0dde57 100644 --- a/user/analitza/APKBUILD +++ b/user/analitza/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=analitza pkgver=17.12.2 -pkgrel=0 +pkgrel=1 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" arch="all" @@ -12,7 +12,8 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev qt5-qtdeclarative-dev eigen-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev" install="" subpackages="$pkgname-dev $pkgname-lang" -source="http://download.kde.org/stable/applications/$pkgver/src/analitza-$pkgver.tar.xz" +source="http://download.kde.org/stable/applications/$pkgver/src/analitza-$pkgver.tar.xz + pmmx-test-failure.patch" build() { cd "$builddir" @@ -40,4 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e326d397db3193492258f156cd71f63e4544abd9724b58769a1593ff57242b18de09291a433ea37658015bd57f75e430ed95bdf99d3863fccfc4b546a9686933 analitza-17.12.2.tar.xz" +sha512sums="e326d397db3193492258f156cd71f63e4544abd9724b58769a1593ff57242b18de09291a433ea37658015bd57f75e430ed95bdf99d3863fccfc4b546a9686933 analitza-17.12.2.tar.xz +c38ce1f8265224aebfa8dcf8ef93a83bb2abd4eb757add3a7578660753bf9f16cbd497c9d696f22a6345602585a06bf4bad2bd89b2ea75e70baf9f8739198da9 pmmx-test-failure.patch" diff --git a/user/analitza/pmmx-test-failure.patch b/user/analitza/pmmx-test-failure.patch new file mode 100644 index 000000000..6e1bce2d4 --- /dev/null +++ b/user/analitza/pmmx-test-failure.patch @@ -0,0 +1,14 @@ +diff --git a/analitza/commands/listcommands.cpp b/analitza/commands/listcommands.cpp +index b77f49a9..2885169a 100644 +--- a/analitza/commands/listcommands.cpp ++++ b/analitza/commands/listcommands.cpp +@@ -69,8 +69,9 @@ Expression RangeCommand::operator()(const QList<Analitza::Expression >& args) + + Analitza::List *seq = new Analitza::List; + +- for (double x = a; x <= b; x += h) ++ for (double x = a; x < b || qFuzzyCompare(x, b); x += h) { + seq->appendBranch(new Analitza::Cn(x)); ++ } + + ret.setTree(seq); diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD new file mode 100644 index 000000000..4f4ea3414 --- /dev/null +++ b/user/apache-httpd/APKBUILD @@ -0,0 +1,137 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=apache-httpd +_pkgreal=httpd +pkgver=2.4.29 +pkgrel=0 +pkgdesc="Open-source HTTP server" +url="https://httpd.apache.org" +arch="all" +license="Apache-2.0" +depends="" +install="$pkgname.pre-install $pkgname.pre-upgrade" +makedepends="apr-dev apr-util-dev autoconf automake libxml2-dev nghttp2-dev + openssl-dev pcre-dev sed zlib-dev" +pkgusers="apache" +pkggroups="apache" +subpackages="$pkgname-dev + $pkgname-doc + $pkgname-http2 + $pkgname-icons::noarch + $pkgname-ldap + $pkgname-openrc" +provides="apache2 apache2-ssl" +source="http://archive.apache.org/dist/$_pkgreal/$_pkgreal-$pkgver.tar.bz2 + adelie.layout + apache-httpd.confd + apache-httpd.initd + apache-httpd.logrotate + conf/httpd.conf + conf/alias.conf + conf/http2.conf + conf/host.conf + conf/proxy.conf + conf/ssl.conf + conf/userdir.conf" +builddir="$srcdir/$_pkgreal-$pkgver" +options="suid !check" + +prepare() { + default_prepare + cat "$srcdir"/adelie.layout >> "$builddir"/config.layout +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --enable-layout=Adelie \ + --enable-so \ + --with-mpm=event \ + --enable-mods-shared=reallyall \ + --enable-ssl \ + --disable-lua \ + --enable-suexec \ + --with-suexec-caller=apache \ + --with-suexec-docroot=/srv/localhost \ + --with-suexec-logfile=/var/log/apache-httpd/suexec.log \ + --with-suexec-bin=/usr/sbin/suexec \ + --with-apr=/usr/bin/apr-1-config \ + --with-apr-util=/usr/bin/apu-1-config \ + --with-pcre=/usr + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" -j1 install + + # apache-provided configuration is awful + rm "$pkgdir"/etc/apache2/*.conf + rm -r "$pkgdir"/etc/apache2/extra + rm -r "$pkgdir"/etc/apache2/original + install -Dm644 "$srcdir"/httpd.conf "$pkgdir"/etc/apache2/httpd.conf + install -Dm644 "$srcdir"/alias.conf "$pkgdir"/etc/apache2/conf.d/alias.conf + install -Dm644 "$srcdir"/http2.conf "$pkgdir"/etc/apache2/conf.d/http2.conf + install -Dm644 "$srcdir"/host.conf "$pkgdir"/etc/apache2/sites.d/localhost.conf + install -Dm644 "$srcdir"/proxy.conf "$pkgdir"/etc/apache2/conf.d/proxy.conf + install -Dm644 "$srcdir"/ssl.conf "$pkgdir"/etc/apache2/conf.d/ssl.conf + install -Dm644 "$srcdir"/userdir.conf "$pkgdir"/etc/apache2/conf.d/userdir.conf + + # init & logrotate handling + install -Dm755 "$srcdir"/apache-httpd.initd "$pkgdir"/etc/init.d/apache-httpd + install -Dm644 "$srcdir"/apache-httpd.confd "$pkgdir"/etc/conf.d/apache-httpd + install -Dm644 "$srcdir"/apache-httpd.logrotate "$pkgdir"/etc/logrotate.d/apache-httpd + + install -dm2750 -g wheel "$pkgdir"/var/log/apache2 +} + +dev() { + default_dev + depends="$depends perl apr-util-dev" + install -d "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/apxs "$subpkgdir"/usr/bin + install -d "$subpkgdir"/usr/share/apache2 + mv "$pkgdir"/usr/share/apache2/build "$subpkgdir"/usr/share/apache2 +} + +http2() { + pkgdesc="Highly experimental protocol support for Apache HTTP server" + local _file + install -d "$subpkgdir"/etc/apache2/conf.d + install -d "$subpkgdir"/usr/libexec/apache2 + + for _file in etc/apache2/conf.d/http2.conf \ + usr/libexec/apache2/mod_proxy_http2.so \ + usr/libexec/apache2/mod_http2.so; do + mv "$pkgdir"/$_file "$subpkgdir"/$_file + done +} + +icons() { + pkgdesc="Public-domain icon pack for Apache HTTP server" + install -d "$subpkgdir"/usr/share/apache2 + mv "$pkgdir"/usr/share/apache2/icons "$subpkgdir"/usr/share/apache2 +} + +ldap() { + pkgdesc="LDAP authentication support for Apache HTTP server" + install -d "$subpkgdir"/usr/libexec/apache2 + mv "$pkgdir"/usr/libexec/apache2/*_ldap.so \ + "$subpkgdir"/usr/libexec/apache2 +} + +sha512sums="840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a httpd-2.4.29.tar.bz2 +c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout +336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd +9893248f1724748c9ef91171728b4c557ced7de543e23ed72cb75c02728048b2813ac99015a4a28e7984daa51faa6e42403c17b875539fe71c33424865eccecf apache-httpd.initd +18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache-httpd.logrotate +cba279f31c12c3516bacf74856493c5a62a94017b3911d457b33e350af646b3e97632b15e396992e5115532c88c81fdd680a951ca0c71eb8a207f39d6c027c41 httpd.conf +83d57c57b809340bb07291c340ded5903ae55c0bba7c48e4eb0d27529ce4ecb6e235378ad770c69c8be2762b5346fa5bec94b6c585510719c37fe6addb33f998 alias.conf +7def0982bda42d5fe3a1812128be455fe0a47161f7fd0facd9ff85056f043a19f520bdb1c01b9f3fb25ddd66aa6224fb4b183f107bccd56719e0c7a88ad70bd9 http2.conf +9745ec511331b2ec399bf7895bc935f9c8526fd81d47cb17e42c1f5c010bbbea0b5ef2f2f4b12984dc8c77f410132010c3e73347a49ebe5feb0c1a763fe73a82 host.conf +905212b9107d71e4d64b338b1c1cf222f7a78979b928e7fa89b06620fbc010df00204a20aa22e69ed49682412d95ecc4e6abaafbb4cb043b31610d5b7a36ac00 proxy.conf +44f97ac0bab5122d409767af388046dfce5cad42ff18d79394f258546d3e578db334da4722cce4dc2ac03f9508a8b97587370cdede5e7678f02b9abc5dda88ee ssl.conf +dd3c8fa9bc32a92c35df8728f6750fab8dd39be9e90e448a44a77efabc3e5516772607548856af520d4d5e8f2aff11f0b56d29db642e69ab72b1683e6aba5aed userdir.conf" diff --git a/user/apache-httpd/adelie.layout b/user/apache-httpd/adelie.layout new file mode 100644 index 000000000..28774e3cb --- /dev/null +++ b/user/apache-httpd/adelie.layout @@ -0,0 +1,22 @@ +<Layout Adelie> + prefix: /usr + exec_prefix: ${prefix} + bindir: ${prefix}/bin + sbindir: ${prefix}/sbin + libdir: ${prefix}/lib + libexecdir: ${prefix}/libexec+ + mandir: ${prefix}/man + sysconfdir: /etc+ + datadir: ${prefix}/share+ + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + localstatedir: /var + htdocsdir: ${localstatedir}/www/localhost + manualdir: ${prefix}/share/doc/apache-httpd/manual + cgidir: ${localstatedir}/www/localhost + includedir: ${prefix}/include+ + runtimedir: /run+ + logfiledir: ${localstatedir}/log+ + proxycachedir: ${localstatedir}/cache+ +</Layout> diff --git a/user/apache-httpd/apache-httpd.confd b/user/apache-httpd/apache-httpd.confd new file mode 100644 index 000000000..c899d9da2 --- /dev/null +++ b/user/apache-httpd/apache-httpd.confd @@ -0,0 +1,51 @@ +# /etc/conf.d/apache2: config file for /etc/init.d/apache2 + +# +# The default processing model (MPM) is the process-based +# 'prefork' model. A thread-based model, 'worker', is also +# available, but does not work with some modules (such as PHP). +# +#HTTPD=/usr/sbin/httpd.worker + +HTTPD="/usr/sbin/httpd" + +# +# To pass additional options (for instance, -D definitions) to the +# httpd binary at startup, set HTTPD_OPTS here. +# +HTTPD_OPTS= + +# Extended options for advanced uses of Apache ONLY +# You don't need to edit these unless you are doing crazy Apache stuff +# As not having them set correctly, or feeding in an incorrect configuration +# via them will result in Apache failing to start +# YOU HAVE BEEN WARNED. + +# PID file +#PIDFILE=/run/apache2/httpd.pid + +# timeout for startup/shutdown checks +#TIMEOUT=10 + +# Configuration file location +# - If this does NOT start with a '/', then it is treated relative to +# $SERVERROOT by Apache +#CONFIGFILE=/etc/apache2/httpd.conf + +# Location to log startup errors to +# They are normally dumped to your terminal. +#STARTUPERRORLOG="/var/log/apache2/startuperror.log" + +# A command that outputs a formatted text version of the HTML at the URL +# of the command line. Designed for lynx, however other programs may work. +#LYNX="lynx -dump" + +# The URL to your server's mod_status status page. +# Required for status and fullstatus +#STATUSURL="http://localhost/server-status" + +# Method to use when reloading the server +# Valid options are 'restart' and 'graceful' +# See http://httpd.apache.org/docs/2.2/stopping.html for information on +# what they do and how they differ. +#RELOAD_TYPE="graceful" diff --git a/user/apache-httpd/apache-httpd.initd b/user/apache-httpd/apache-httpd.initd new file mode 100755 index 000000000..c18643735 --- /dev/null +++ b/user/apache-httpd/apache-httpd.initd @@ -0,0 +1,146 @@ +#!/sbin/openrc-run + +extra_commands="configdump configtest modules virtualhosts" +extra_started_commands="fullstatus graceful gracefulstop reload" + +depend() { + need net + use mysql dns logger netmount postgresql + after sshd firewall +} + +configtest() { + ebegin "Checking ${SVCNAME} configuration" + checkconfig + eend $? +} + +checkconfd() { + PIDFILE="${PIDFILE:-/run/apache2/httpd.pid}" + TIMEOUT=${TIMEOUT:-10} + + CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}" + [ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}" + if [ ! -r "${CONFIGFILE}" ]; then + eerror "Unable to read configuration file: ${CONFIGFILE}" + return 1 + fi + HTTPD_OPTS="${HTTPD_OPTS} -f ${CONFIGFILE}" + [ -n "${STARTUPERRORLOG}" ] && HTTPD_OPTS="${HTTPD_OPTS} -E ${STARTUPERRORLOG}" + return 0 + +} + +checkconfig() { + checkconfd || return 1 + + ${HTTPD} ${HTTPD_OPTS} -t 1>/dev/null 2>&1 + ret=$? + if [ $ret -ne 0 ]; then + eerror "${SVCNAME} has detected an error in your setup:" + ${HTTPD} ${HTTPD_OPTS} -t + fi + + return $ret +} + +start() { + checkconfig || return 1 + checkpath --directory $(dirname $PIDFILE) + + [ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start \ + --pidfile ${PIDFILE} \ + --exec ${HTTPD} \ + -- ${HTTPD_OPTS} -k start + eend $? +} + +stop() { + checkconfd || return 1 + + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \ + --retry ${TIMEOUT} + eend $? +} + +reload() { + RELOAD_TYPE="${RELOAD_TYPE:-graceful}" + + checkconfig || return 1 + service_started "${SVCNAME}" || return + + if [ "${RELOAD_TYPE}" = "restart" ]; then + ebegin "Restarting ${SVCNAME}" + ${HTTPD} ${HTTPD_OPTS} -k restart + eend $? + elif [ "${RELOAD_TYPE}" = "graceful" ]; then + ebegin "Gracefully restarting ${SVCNAME}" + ${HTTPD} ${HTTPD_OPTS} -k graceful + eend $? + else + eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/${SVCNAME}" + fi +} + +graceful() { + checkconfig || return 1 + service_started "${SVCNAME}" || return + ebegin "Gracefully restarting ${SVCNAME}" + ${HTTPD} ${HTTPD_OPTS} -k graceful + eend $? +} + +gracefulstop() { + checkconfig || return 1 + ebegin "Gracefully stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \ + --retry SIGWINCH/${TIMEOUT} + eend $? +} + +modules() { + checkconfig || return 1 + + ${HTTPD} ${HTTPD_OPTS} -M 2>&1 +} + +fullstatus() { + LYNX="${LYNX:-lynx -dump}" + STATUSURL="${STATUSURL:-http://localhost/server-status}" + + if ! service_started "${SVCNAME}"; then + eerror "${SVCNAME} not started" + elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + eerror "lynx not installed!" + else + ${LYNX} ${STATUSURL} + fi +} + +virtualhosts() { + checkconfd || return 1 + ${HTTPD} ${HTTPD_OPTS} -S +} + +configdump() { + LYNX="${LYNX:-lynx -dump}" + INFOURL="${INFOURL:-http://localhost/server-info}" + + checkconfd || return 1 + + if ! service_started "${SVCNAME}"; then + eerror "${SVCNAME} not started" + elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + eerror "lynx not installed!" + else + echo "${HTTPD} started with '${HTTPD_OPTS}'" + for i in config server list; do + ${LYNX} "${INFOURL}/?${i}" | sed '/Apache Server Information/d;/^[[:space:]]\+[_]\+$/Q' + done + fi +} + diff --git a/user/apache-httpd/apache-httpd.logrotate b/user/apache-httpd/apache-httpd.logrotate new file mode 100644 index 000000000..b50fb7147 --- /dev/null +++ b/user/apache-httpd/apache-httpd.logrotate @@ -0,0 +1,10 @@ +/var/log/apache2/*log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /etc/init.d/apache2 --quiet --ifstarted reload > /dev/null 2>/dev/null || true + endscript +} + diff --git a/user/apache-httpd/apache-httpd.pre-install b/user/apache-httpd/apache-httpd.pre-install new file mode 100644 index 000000000..d4ede7476 --- /dev/null +++ b/user/apache-httpd/apache-httpd.pre-install @@ -0,0 +1,8 @@ +#!/bin/sh + +addgroup -S -g 82 www-data 2>/dev/null +addgroup -S apache 2>/dev/null +adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null +addgroup apache www-data 2>/dev/null + +exit 0 diff --git a/user/apache-httpd/apache-httpd.pre-upgrade b/user/apache-httpd/apache-httpd.pre-upgrade new file mode 100644 index 000000000..d4ede7476 --- /dev/null +++ b/user/apache-httpd/apache-httpd.pre-upgrade @@ -0,0 +1,8 @@ +#!/bin/sh + +addgroup -S -g 82 www-data 2>/dev/null +addgroup -S apache 2>/dev/null +adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null +addgroup apache www-data 2>/dev/null + +exit 0 diff --git a/user/apache-httpd/conf/alias.conf b/user/apache-httpd/conf/alias.conf new file mode 100644 index 000000000..d7df50c58 --- /dev/null +++ b/user/apache-httpd/conf/alias.conf @@ -0,0 +1,13 @@ +<IfModule alias_module> +# This configuration allows for acmetool to run in webroot mode, aliasing +# the ACME challenge to the acmetool runtime challenge directory. +# +#Alias "/.well-known/acme-challenge/" "/var/run/acme/acme-challenge/" +#<Directory "/var/run/acme/acme-challenge"> +# AllowOverride None +# Options None +# +# # If using Apache 2.4+ +# Require all granted +#</Directory> +</IfModule>
\ No newline at end of file diff --git a/user/apache-httpd/conf/host.conf b/user/apache-httpd/conf/host.conf new file mode 100644 index 000000000..1c5902a70 --- /dev/null +++ b/user/apache-httpd/conf/host.conf @@ -0,0 +1,38 @@ +# This is a sample configuration. Please read the documentation provided +# by the Apache HTTP server for information on how to modify this file. +# +# Note that these settings are normally defined in a <VirtualHost> block. +# This is omitted here in order to allow users to confirm that Apache works +# before they start poking around with site-specific configuration. + +# This is the directory in which Apache looks for files to serve. Generally, +# documents should be located in /srv, using either of the following example +# hierarchies: +# +# /srv/ +# `-> www/ -- the protocol; 'www' is used here for both HTTP and HTTPS. +# `-> localhost/ -- the domain name +# +# For systems serving many disparate groups, you may try the following: +# /srv/ +# `-> groupname/ -- for instance, 'physics' or 'chemistry' or 'history' +# `-> www/ +# `-> localhost/ +# +# We use /var/www here because /srv is intended for sysadmin (that is, you, +# the person reading this document) use. +DocumentRoot /var/www/localhost + +<Directory /var/www/localhost> +# Some configuration options that don't really go anywhere else. +# Here, we want empty directories to have an index generated for them +# ('Indexes') and for symlinks to be followed only if the owner of the +# directory matches the owner of the target. +Options Indexes SymLinksifOwnerMatch + +# Don't allow .htaccess files to override these settings. +AllowOverride None + +# Grants access if an authentication system is loaded (not the default). +Require all granted +</Directory> diff --git a/user/apache-httpd/conf/http2.conf b/user/apache-httpd/conf/http2.conf new file mode 100644 index 000000000..fb4ef9f08 --- /dev/null +++ b/user/apache-httpd/conf/http2.conf @@ -0,0 +1,3 @@ +<IfModule http2_module> +Protocols h2 http/1.1 +</IfModule>
\ No newline at end of file diff --git a/user/apache-httpd/conf/httpd.conf b/user/apache-httpd/conf/httpd.conf new file mode 100644 index 000000000..7fe8adfdf --- /dev/null +++ b/user/apache-httpd/conf/httpd.conf @@ -0,0 +1,110 @@ +# This is a sample apache-httpd configuration file. +# +# Sensible defaults have been chosen for everyday use. It is suggested +# that you read the documentation before modifying this file. + +# This controls what information is sent in the 'Server' HTTP header. +# This is the most secure option. For internal use, you might go into +# more detail. In order from most informative to least, the possible +# values are: Full, OS, Minor, Minimal, Major, Prod. +ServerTokens Prod +# What IP/port to listen on. By default, listens to port 80 on all IPs. +Listen 80 + +# The rest of these modules are required for basic operations. +LoadModule log_config_module /usr/libexec/apache2/mod_log_config.so +LoadModule mime_module /usr/libexec/apache2/mod_mime.so +LoadModule mime_magic_module /usr/libexec/apache2/mod_mime_magic.so +LoadModule autoindex_module /usr/libexec/apache2/mod_autoindex.so +LoadModule authz_core_module /usr/libexec/apache2/mod_authz_core.so +LoadModule dir_module /usr/libexec/apache2/mod_dir.so +LoadModule unixd_module /usr/libexec/apache2/mod_unixd.so +LoadModule deflate_module /usr/libexec/apache2/mod_deflate.so + +# This module is optional, but it's necessary for things like automatically +# upgrading connections to HTTPS if clients try to connect on port 80. +LoadModule rewrite_module /usr/libexec/apache2/mod_rewrite.so + +# This module is optional, but you need this if you want to proxy connections, +# particularly via HTTP (e.g. for the acmetool proxy example in +# conf.d/proxy.conf). +#LoadModule proxy_module /usr/libexec/apache2/mod_proxy.so +#LoadModule proxy_http_module /usr/libexec/apache2/mod_proxy_http.so + +# This module enables per-user directories. +#LoadModule userdir_module /usr/libexec/apache2/mod_userdir.so + +# This module is optional; you must have it enabled if you want HTTP/2. +#LoadModule ssl_module /usr/libexec/apache2/mod_ssl.so + +# This module is optional; it enables HTTP/2 support. +#LoadModule http2_module /usr/libexec/apache2/mod_http2.so + +# Unix daemon configuration. +<IfModule unixd_module> +User apache +Group apache +</IfModule> + +# Per-server configuration; these will be the defaults unless modified +# within <VirtualHost> blocks. + +# Server contact address. Not visible by default. +ServerAdmin you@example.com + +# Whether to include server information in server-generated pages. +# This is the secure default. +ServerSignature Off + +# This directive denies access to the entire server filesystem by default. +# You must explicitly permit access in other <Directory> blocks, such as +# in <VirtualHost> blocks. This is the secure default. +<Directory /> +AllowOverride none +Require all denied +</Directory> + +# Default to index.html or index.htm for directory indexes. +<IfModule dir_module> +DirectoryIndex index.html index.htm +</IfModule> + +# This prevents clients from accessing .htpasswd and .htaccess files. +# This is a secure default. +<Files ".ht*"> +Require all denied +</Files> + +# This is where errors will be logged. This directive is subsumed by +# <VirtualHost> blocks which also use the directive. +ErrorLog /var/log/apache2/error.log + +# How verbose the error log is. Possible values, from most to least verbose: +# debug, info, notice, warn, error, crit, alert, emerg +LogLevel Warn + +# A sensible default logging format. Like ErrorLog, this directive is +# subsumed by <VirtualHost> blocks which also use it. +<IfModule log_config_module> +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +CustomLog /var/log/apache2/access.log combined +</IfModule> + +# Mapping of file extension to MIME types. This uses the mapping provided +# by Apache. +<IfModule mime_module> +TypesConfig /etc/apache2/mime.types +</IfModule> + +# On the other hand, this module allows Apache to inspect the file in order +# to provide a possibly more accurate MIME type. +<IfModule mime_magic_module> +MIMEMagicFile /etc/apache2/magic +</IfModule> + +# Include other configurations which may be available. Configuration for +# optional modules will be found here. +IncludeOptional /etc/apache2/conf.d/*.conf + +# Site-specific configurations. +IncludeOptional /etc/apache2/sites.d/*.conf diff --git a/user/apache-httpd/conf/proxy.conf b/user/apache-httpd/conf/proxy.conf new file mode 100644 index 000000000..153236b17 --- /dev/null +++ b/user/apache-httpd/conf/proxy.conf @@ -0,0 +1,6 @@ +<IfModule proxy_module> +# This rule allows for acmetool to handle Let's Encrypt certification +# using the proxy method, and is provided here as an example. +# You will need both mod_proxy and mod_proxy_http loaded for this. +#ProxyPass "/.well-known/acme-challenge" "http://127.0.0.1:402/.well-known/acme-challenge" +</IfModule> diff --git a/user/apache-httpd/conf/rewrite.conf b/user/apache-httpd/conf/rewrite.conf new file mode 100644 index 000000000..07513e990 --- /dev/null +++ b/user/apache-httpd/conf/rewrite.conf @@ -0,0 +1,8 @@ +<IfModule rewrite_module> +RewriteEngine On +# These rules automatically redirect bare HTTP to HTTPS. +#<IfModule ssl_module> +#RewriteCond %{HTTPS} off +#RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} +#</IfModule> +</IfModule> diff --git a/user/apache-httpd/conf/ssl.conf b/user/apache-httpd/conf/ssl.conf new file mode 100644 index 000000000..bb3dd02c5 --- /dev/null +++ b/user/apache-httpd/conf/ssl.conf @@ -0,0 +1,24 @@ +<IfModule ssl_module> +# The following should appear in each <VirtualHost> block that plans to +# use SSL/TLS. +# +# SSLEngine on +# SSLCertificateFile /path/to/signed_certificate_followed_by_intermediate_certs +# SSLCertificateKeyFile /path/to/private/key +# +# # Uncomment the following directive when using client certificate authentication +# #SSLCACertificateFile /path/to/ca_certs_for_client_authentication +# +# # HSTS (mod_headers is required) (15768000 seconds = 6 months) +# <IfModule headers_module> +# Header always set Strict-Transport-Security "max-age=15768000" +# </IfModule> +# + +Listen 443 +# At the moment, these options the current best practices for modern users. +SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1 +SSLCipherSuite ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256 +SSLHonorCipherOrder on +SSLSessionTickets off +</IfModule> diff --git a/user/apache-httpd/conf/userdir.conf b/user/apache-httpd/conf/userdir.conf new file mode 100644 index 000000000..bc05ff9c0 --- /dev/null +++ b/user/apache-httpd/conf/userdir.conf @@ -0,0 +1,7 @@ +<IfModule userdir_module> +# This directive disables UserDir. To enable it, supply a directory. You +# might append 'enabled' and a list of users to white-list them, or +# 'disabled' and a list of users to blacklist them. This directive can +# appear multiple times. +UserDir disabled +</IfModule>
\ No newline at end of file diff --git a/user/appres/APKBUILD b/user/appres/APKBUILD new file mode 100644 index 000000000..7f5f0b7dd --- /dev/null +++ b/user/appres/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=appres +pkgver=1.0.5 +pkgrel=0 +pkgdesc="list X application resource database" +url="https://xorg.freedesktop.org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxt-dev xproto" +install="" +subpackages="$pkgname-doc" +source="https://xorg.freedesktop.org/archive/individual/app/$pkgname-$pkgver.tar.bz2" +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137 appres-1.0.5.tar.bz2" diff --git a/user/bzflag/APKBUILD b/user/bzflag/APKBUILD new file mode 100644 index 000000000..12f55f405 --- /dev/null +++ b/user/bzflag/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=bzflag +pkgver=2.4.12 +pkgrel=0 +pkgdesc="a 3D networked multi-player multi-platform tank battle game" +url="https://www.bzflag.org/" +arch="all" +license="LGPL-2.1+ MPL-2.0" +depends="" +depends_dev="zlib-dev c-ares-dev curl-dev ncurses-dev sdl2-dev glew-dev" +makedepends="$depends_dev" +install="" +subpackages="$pkgname-doc" +source="https://download.bzflag.org/bzflag/source/$pkgver/$pkgname-$pkgver.tar.bz2 + defineAddrLen.patch" +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="9b5fa6b7ab7eb13043242defcc86cbed083e98306b2f611932b48d6d833a37bbe2ab05a0a3d1a2c9b861bfbd834fc6e86783ba82d8a841527d0eedb06f3bde9f bzflag-2.4.12.tar.bz2 +568e581dd82ca28aa43281a86867408c726ad4f2145f115a5d3535dbc472463c94288e9349ced715004191af0925daff7e3d55fe1db3ab35554352cc703d79b9 defineAddrLen.patch" diff --git a/user/bzflag/defineAddrLen.patch b/user/bzflag/defineAddrLen.patch new file mode 100644 index 000000000..b1189dcac --- /dev/null +++ b/user/bzflag/defineAddrLen.patch @@ -0,0 +1,11 @@ +--- a/include/network.h 2018-04-23 23:17:50.969874036 -0700 ++++ b/include/network.h 2018-04-23 23:18:37.750554121 -0700 +@@ -57,7 +57,7 @@ + # include <bstring.h> + #endif + +-#if defined(BSD) || defined(__sun__) || defined(__GLIBC__) ++#if defined(BSD) || defined(__sun__) || defined(__linux__) + # define AddrLen socklen_t + #elif defined (__APPLE__) + # include <AvailabilityMacros.h> diff --git a/user/dosbox/APKBUILD b/user/dosbox/APKBUILD new file mode 100644 index 000000000..88436520d --- /dev/null +++ b/user/dosbox/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Horst Burkhardt <horst@adelielinux.org> +# Maintainer: Horst Burkhardt <horst@adelielinux.org> +pkgname=dosbox +pkgver=0.82.7 +pkgrel=0 +pkgdesc="an emulator for MS-DOS games" +url="https://github.com/joncampbell123/dosbox-x/" +arch="all !s390x" +options="!check" # dosbox does not ship tests +subpackages="" +license="GPL-2.0-only" +depends="" +makedepends="ncurses-dev zlib-dev libxkbfile-dev libpng-dev libpcap-dev fluidsynth-dev sdl2-dev alsa-lib-dev" +source="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-wip-20180513-1316.tar.gz + porttalk-fix.patch + asmfix.patch + posix-headers.patch + " +builddir="$srcdir/dosbox-x-dosbox-x-wip-20180513-1316" + +build() { + cd "$builddir" + ./autogen.sh + ./configure --prefix=/usr --enable-debug --enable-core-inline --enable-sdl2 + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="38b7423b695f3b0dfd26f8c8913f26afba73ea6235bb205ec3a5d7f08ef3c74a9b6ce2577f0ea8eb49724b548e3386332256d13f27469b165986702650638992 dosbox-x-wip-20180513-1316.tar.gz +daf0efea03d6295f5a20d8d197f7d0ba38e0608edcfe8be19fc6091b783885d523557674f0f7df83b88186b77794723106cf7a0e02125d2cc75ecfd7d51fa91d porttalk-fix.patch +266ede57d21030f7752287f18660b47e9185a9aef9d022337dded9c9ce93e572691b41aca878f8a28c67bf5d217c7e84912336c21aacf594085dc31d99862ebf asmfix.patch +462e84d5bac8fb2c1317b303d1bdda72a50e9eedfb5251450cb8d0f98f4297d6a483eb2c95624cbc8d25e917788032dd1e7d8b0d06d82dad6600f8bd6eec85f4 posix-headers.patch" diff --git a/user/dosbox/asmfix.patch b/user/dosbox/asmfix.patch new file mode 100644 index 000000000..db341e42c --- /dev/null +++ b/user/dosbox/asmfix.patch @@ -0,0 +1,11 @@ +--- dosbox-x-dosbox-x-wip-20180513-1316/src/cpu/core_dyn_x86/risc_x86.h 2018-05-13 19:52:17.000000000 +0000 ++++ dosbox-x-dosbox-x-wip-20180513-1316/src/cpu/core_dyn_x86/risc_x86.h 2018-05-16 12:02:44.329617468 +0000 +@@ -130,7 +130,7 @@ + #else + register Bit32u tempflags=reg_flags & FMASK_TEST; + __asm__ volatile ( +- "pushl $(run_return_adress) \n" ++ "call 1f ; 1: addl $run_return_adress-.,(%%esp) \n" + "pushl %2 \n" + "jmp *%3 \n" + "run_return_adress: \n" diff --git a/user/dosbox/porttalk-fix.patch b/user/dosbox/porttalk-fix.patch new file mode 100644 index 000000000..4cb4a6a0e --- /dev/null +++ b/user/dosbox/porttalk-fix.patch @@ -0,0 +1,15 @@ +diff -Naur dosbox-x-dosbox-x-wip-20180513-1316/src/libs/porttalk/porttalk.cpp dosbox-x-dosbox-x-wip-20180513-1316-porttalk-fix/src/libs/porttalk/porttalk.cpp +--- dosbox-x-dosbox-x-wip-20180513-1316/src/libs/porttalk/porttalk.cpp 2018-05-13 19:52:17.000000000 +0000 ++++ dosbox-x-dosbox-x-wip-20180513-1316-porttalk-fix/src/libs/porttalk/porttalk.cpp 2018-05-16 12:40:17.232921780 +0000 +@@ -233,7 +233,11 @@ + #ifdef LINUX + # if defined(__i386__) || defined(__amd64__) || defined(__x86_64__) + // This Linux ioperm only works up to port 0x3FF ++#if (__GNU_LIBRARY__ >= 6) + #include <sys/perm.h> ++#elif defined(__linux__) && !defined(__GLIBC__) ++#include <sys/io.h> ++#endif + + bool initPorttalk() { + if(ioperm(0x3da,1,1) < 0) return false; diff --git a/user/dosbox/posix-headers.patch b/user/dosbox/posix-headers.patch new file mode 100644 index 000000000..3ed6bb07a --- /dev/null +++ b/user/dosbox/posix-headers.patch @@ -0,0 +1,10 @@ +--- dosbox/src/dos/drive_local.cpp 2018-05-13 14:52:17.000000000 -0500 ++++ dosbox/src/dos/drive_local.cpp 2018-05-27 02:24:20.057150551 -0500 +@@ -22,6 +22,7 @@ + #include <string.h> + #include <time.h> + #include <errno.h> ++#include <limits.h> + + #include "dosbox.h" + #include "dos_inc.h" diff --git a/user/efibootmgr/APKBUILD b/user/efibootmgr/APKBUILD index 3180f0b21..194d32d7c 100644 --- a/user/efibootmgr/APKBUILD +++ b/user/efibootmgr/APKBUILD @@ -5,7 +5,7 @@ pkgver=15 pkgrel=0 pkgdesc="A user-space application to modify the Intel EFI Boot Manager" url="https://github.com/rhboot/efibootmgr" -arch="x86 x86_64 arm64 ia64" +arch="pmmx x86_64 arm64 ia64" license="GPL-2.0" depends="" makedepends="efivar-dev gettext-dev" diff --git a/user/efivar/APKBUILD b/user/efivar/APKBUILD index 8076176e9..6177b1c4d 100644 --- a/user/efivar/APKBUILD +++ b/user/efivar/APKBUILD @@ -5,7 +5,7 @@ pkgver=31 pkgrel=0 pkgdesc="Tools and library to manipulate EFI variables" url="https://github.com/rhboot/efivar" -arch="x86 x86_64 arm64 ia64" +arch="pmmx x86_64 arm64 ia64" license="LGPL-2.1" depends="" depends_dev="popt-dev" diff --git a/user/feh/APKBUILD b/user/feh/APKBUILD index 1ea78d33e..bb3b1d276 100644 --- a/user/feh/APKBUILD +++ b/user/feh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=feh -pkgver=2.25.1 +pkgver=2.26.3 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="http://feh.finalrewind.org/" @@ -35,4 +35,4 @@ package() { install } -sha512sums="a821d46901d4cf59bb09b911f28c6ab26fbd0ee9784b50fbacfb6cf23483da5d29ebbb4cc53b23289181bb3ba0dc9893a3f39a90b3420d0bd98d740d5583fc3e feh-2.25.1.tar.bz2" +sha512sums="b7212e99d4210b71c1d84e6712b7cac18a65367ebf9a17d889412dddb66aefd2c3f0bf0b624b09f3b46aa007cd27ac1bd2e4a7c4757e8bc90d49d2a435baaf06 feh-2.26.3.tar.bz2" diff --git a/user/ftmenu/APKBUILD b/user/ftmenu/APKBUILD new file mode 100644 index 000000000..409ee092a --- /dev/null +++ b/user/ftmenu/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=ftmenu +pkgver=0.4.0 +pkgrel=0 +pkgdesc="a toolbar icon to reach your Fluxbox menus" +url="http://ftmenu.sourceforge.net/" +arch="all" +license="GPL-3.0" +depends="" +makedepends="gtk+2.0-dev" +install="" +subpackages="" +options="!check" # there is currently no testsuite to run +source="https://downloads.sourceforge.net/project/ftmenu/ftmenu/ftmenu-0.4/ftmenu-$pkgver.tar.gz + include-stdlib.patch" +builddir="$srcdir/ftmenu-$pkgver" + +build() { + cd "$builddir" + autoreconf -if + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7b83d2b7bb186d2a78f3425f364fc34263332ce881ebbed4805767834610d3fba474b296343de9f2d01aefb10e6638ed356c617ad460746f1a60f0f85d3e6e10 ftmenu-0.4.0.tar.gz +d17a2aff7df7ed285ff9027a7495bf80053b1c9308ecc0f463c56485c9874ffe673755d44b55f758c0677119c18ebb343056e6cc3995b91c902e36358f1d6906 include-stdlib.patch" diff --git a/user/ftmenu/include-stdlib.patch b/user/ftmenu/include-stdlib.patch new file mode 100644 index 000000000..af420a34b --- /dev/null +++ b/user/ftmenu/include-stdlib.patch @@ -0,0 +1,10 @@ +--- a/src/ftmenu.c 2018-04-26 23:37:11.004875301 -0700 ++++ b/src/ftmenu.c 2018-04-26 23:36:48.794546383 -0700 +@@ -4,6 +4,7 @@ + #include <string.h> + #include <stdio.h> + #include <unistd.h> ++#include <stdlib.h> + #include "ftmenu.h" + + GtkWidget *menu[MAX_MENU_DEPTH]; diff --git a/user/genmenu/APKBUILD b/user/genmenu/APKBUILD new file mode 100644 index 000000000..016cd5b06 --- /dev/null +++ b/user/genmenu/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: Daniel Theisen <djt@hxx.in> +# Maintainer: Daniel Theisen <djt@hxx.in> +pkgname=genmenu +pkgver=1.1.0 +pkgrel=0 +pkgdesc="Enlightenment, Blackbox, Openbox, Fluxbox and WindowMaker Menu Generator" +url="https://f00l.de/genmenu/" +arch="noarch" +license="GPL-2.0+" +depends="bash" +makedepends="" +subpackages="" +options="!check" # this is literally just a bash script +source="https://f00l.de/$pkgname/$pkgname-$pkgver.tar.bz2" + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -D -o root -g root -m 644 -t $pkgdir/bin/ genmenu +} + +sha512sums="eb87db30f6787570ffe844c7b9b25542652e485296ec061ab1da8f2b1bae40942630c9ca141cf8c7b55ce4d99d1b173511850247a5e07243256eb71588515e54 genmenu-1.1.0.tar.bz2" diff --git a/user/glfw/APKBUILD b/user/glfw/APKBUILD new file mode 100644 index 000000000..f060ef75e --- /dev/null +++ b/user/glfw/APKBUILD @@ -0,0 +1,49 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=glfw +pkgver=3.2.1 +pkgrel=0 +pkgdesc="OpenGL desktop development library" +url="http://www.glfw.org/" +arch="all" +options="!check" # Tests require X11, GL, and manual intervention. +license="Zlib" +depends="" +depends_dev="mesa-dev" +makedepends="$depends_dev cmake doxygen libx11-dev libxrandr-dev libxcursor-dev + libxinerama-dev" +install="" +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/glfw/glfw/releases/download/3.2.1/glfw-$pkgver.zip" +sha512sums="73dd6d4a8d28a2b423f0fb25489659c1a845182b7ef09848d4f442cdc489528aea90f43ac84aeedb9d2301c4487f39782b647ee4959e67e83babb838372b980c glfw-3.2.1.zip" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_SHARED_LIBS=ON \ + -DGLFW_BUILD_TESTS=OFF \ + -DGLFW_BUILD_EXAMPLES=OFF \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + install -D -d "$builddir"/docs/html "$pkgdir"/usr/share/doc/$pkgname/ +} + diff --git a/user/id3lib/APKBUILD b/user/id3lib/APKBUILD index d97b8c684..c395a7645 100644 --- a/user/id3lib/APKBUILD +++ b/user/id3lib/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=id3lib pkgver=3.8.3 -pkgrel=0 +pkgrel=1 pkgdesc="Library for reading, writing, and manipulating ID3v2 tags" url="http://id3lib.sourceforge.net" arch="all" @@ -13,6 +13,7 @@ makedepends="$depends_dev" install="" subpackages="$pkgname-dev" source="https://downloads.sourceforge.net/project/id3lib/id3lib/$pkgver/id3lib-$pkgver.tar.gz + cstring.patch modern-cpp.patch test-expose-proper-stdlib-symbols.patch " @@ -47,5 +48,6 @@ package() { } sha512sums="3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf id3lib-3.8.3.tar.gz +e379e848788f7fda3a86b02b9865dfe5db69d66ffcfb81184c1cd92f2f1ed7b4d40f13cc77f9de294afc13ae61ab50c3aa13f9a4cc4eb85cb7a727d25268ee6a cstring.patch 334eed099c93ea279d877437a92f684bfb0df12774fd7fffb628b6e8c4b17b17952d6f7c0bf0dff03a87887f0f1233c70d98b69f23580dcf3bf64c8d4b93fc85 modern-cpp.patch cd79daddffbafc11e555f16be827ccedc03e419b7c24ab1da1852af294dc486a0836d612318eb9861691ef8462ca38be41cfa2c12849f022ebb187c6ef95a1b9 test-expose-proper-stdlib-symbols.patch" diff --git a/user/id3lib/cstring.patch b/user/id3lib/cstring.patch new file mode 100644 index 000000000..dfb80119a --- /dev/null +++ b/user/id3lib/cstring.patch @@ -0,0 +1,10 @@ +--- id3lib-3.8.3/include/id3/id3lib_strings.h.old 2003-03-01 18:23:00.000000000 -0600 ++++ id3lib-3.8.3/include/id3/id3lib_strings.h 2018-03-25 14:47:42.035694885 -0500 +@@ -30,6 +30,7 @@ + #define _ID3LIB_STRINGS_H_ + + #include <string> ++#include <cstring> + + #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) + namespace std diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD index 2f13e2b92..39b57b3b9 100644 --- a/user/kactivitymanagerd/APKBUILD +++ b/user/kactivitymanagerd/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivitymanagerd pkgver=5.12.2 -pkgrel=0 +pkgrel=1 pkgdesc="Service to manage KDE Plasma activities" url="https://www.kde.org/" arch="all" license="GPL-2.0" -depends="" +depends="qt5-qtbase-sqlite" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev boost-dev python3 kconfig-dev kcoreaddons-dev kwindowsystem-dev kio-dev kglobalaccel-dev kxmlgui-dev" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD new file mode 100644 index 000000000..a85e245fb --- /dev/null +++ b/user/kget/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kget +pkgver=17.12.2 +pkgrel=0 +pkgdesc="Versatile download manager" +url="https://www.kde.org/applications/internet/kget/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev + kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kio-dev + kdoctools-dev kiconthemes-dev kitemviews-dev kcmutils-dev kparts-dev + kdelibs4support-dev knotifications-dev knotifyconfig-dev kservice-dev + solid-dev ktextwidgets-dev kwallet-dev kwidgetsaddons-dev kxmlgui-dev + kwindowsystem-dev gpgme-dev qca-dev boost-dev libktorrent-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="http://download.kde.org/stable/applications/$pkgver/src/kget-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="affc47f456946001ca0ad230720ed3a1b21ee274d1df865fe7b405b852dff55a1a85ae30cae15bcf4ef667e285719ec3d72d8adce994f96e92f3069f9fae541a kget-17.12.2.tar.xz" diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index 56bfab7fa..7dc6c4293 100644 --- a/user/kio/APKBUILD +++ b/user/kio/APKBUILD @@ -17,7 +17,8 @@ makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev gettext-dev install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="http://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz - D11011-msghdr-iovec-struct.patch" + D11011-msghdr-iovec-struct.patch + strcpy-ppc.patch" builddir="$srcdir/kio-$pkgver" build() { @@ -48,4 +49,5 @@ package() { } sha512sums="23885d851dade24bb08ba1de2eda65db3ab13c8f378a42281f8a50230c9e836b5255643c89fbfca3dedc1e41ee259e67aaed2933cdf739ee4fb1c7eb650b95f6 kio-5.43.0.tar.xz -c08360de86780f63703d70f607d90410043c8a8711eab7315e2ac66e2e656fec9f9a6f5d04c031f739a0187c0d34aa35b5942f59f47efb60ad95584f95087979 D11011-msghdr-iovec-struct.patch" +c08360de86780f63703d70f607d90410043c8a8711eab7315e2ac66e2e656fec9f9a6f5d04c031f739a0187c0d34aa35b5942f59f47efb60ad95584f95087979 D11011-msghdr-iovec-struct.patch +280b2a610613786e688c06f4d4b51d3b9d583472bf1941b7b5873fece31b5df0b2f8f08f8de677ebb39fc906c57a2fa50d7890105c0aeb930b82986e0b504623 strcpy-ppc.patch" diff --git a/user/kio/strcpy-ppc.patch b/user/kio/strcpy-ppc.patch new file mode 100644 index 000000000..95f2deb9c --- /dev/null +++ b/user/kio/strcpy-ppc.patch @@ -0,0 +1,10 @@ +--- kio-5.43.0/src/ioslaves/file/sharefd_p.h.old 2018-03-09 01:13:49.473808589 -0600 ++++ kio-5.43.0/src/ioslaves/file/sharefd_p.h 2018-03-09 01:35:33.903523248 -0600 +@@ -21,6 +21,7 @@ + #include <sys/un.h> + #include <iostream> + #include <unistd.h> ++#include <cstring> + #include <sys/socket.h> + + // fix SOCK_NONBLOCK for e.g. macOS diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index 9da29c26e..933d54e34 100644 --- a/user/kmime/APKBUILD +++ b/user/kmime/APKBUILD @@ -6,6 +6,7 @@ pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" arch="all" +options="!check" # wtf license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev kcodecs-dev ki18n-dev" diff --git a/user/konversation/APKBUILD b/user/konversation/APKBUILD new file mode 100644 index 000000000..07a889833 --- /dev/null +++ b/user/konversation/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=konversation +pkgver=1.7.4 +pkgrel=0 +pkgdesc="KDE IRC (Internet Relay Chat) client" +url="https://konversation.kde.org/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev + kbookmarks-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev ki18n-dev + kdoctools-dev kemoticons-dev kidletime-dev knotifyconfig-dev kio-dev + kparts-dev solid-dev kwallet-dev kwidgetsaddons-dev kglobalaccel-dev + kdbusaddons-dev knotifications-dev kwindowsystem-dev kiconthemes-dev + kitemviews-dev phonon-dev qca-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/konversation/$pkgver/src/konversation-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8d30fc0c0e533f1fa3268f8360eb5b9321b505fca3103ce189f707247345b2b2c409f590ce45d6fb129a76fc642a4e9f6a802c244a0a3e56aded422ddf4ed19a konversation-1.7.4.tar.xz" diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD new file mode 100644 index 000000000..9524e686b --- /dev/null +++ b/user/krdc/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=krdc +pkgver=17.12.2 +pkgrel=0 +pkgdesc="View and control remote desktops (RDP and VNC)" +url="https://www.kde.org/applications/internet/krdc/" +arch="all" +license="GPL-2.0-only" +depends="" +depends_dev="qt5-qtbase-dev kwallet-dev kconfig-dev kcoreaddons-dev" +makedepends="cmake extra-cmake-modules kcmutils-dev kdnssd-dev kiconthemes-dev + knotifications-dev kbookmarks-dev kdoctools-dev kxmlgui-dev ki18n-dev + kcompletion-dev kwallet-dev kwidgetsaddons-dev knotifyconfig-dev + libvncserver-dev $depends_dev" +install="" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="http://download.kde.org/stable/applications/$pkgver/src/krdc-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b9a861754d87761ffc96ea10fcfdb5dec51a343515736054acb4c37675d02624cebcc3de061efb84f6492221ab4c1bf6b84ae885ec428f268245a2dc6b944779 krdc-17.12.2.tar.xz" diff --git a/user/kst/APKBUILD b/user/kst/APKBUILD new file mode 100644 index 000000000..4709cd4c8 --- /dev/null +++ b/user/kst/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kst +pkgver=2.0.8 +pkgrel=0 +pkgdesc="Real-time dataset viewing and plotting tool" +url="https://kst-plot.kde.org/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev gsl-dev" +install="" +langdir="/usr/share/kst/locale" +subpackages="$pkgname-doc $pkgname-lang" +source="https://downloads.sourceforge.net/project/kst/Kst%20$pkgver/Kst-$pkgver.tar.gz + kst-gsl2.patch" +builddir="$srcdir/Kst-$pkgver" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -Dkst_qt5="YesPlease" \ + -Dkst_install_prefix="/usr" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb Kst-2.0.8.tar.gz +1dbd94d7e4298d768ab1e9e020dd207b848e72b30db6b1f2ef2f3eb0d528ec5c0a120593e7e7c06f4cb1e59e950a965e217c30564a26510a180d82418628d4e5 kst-gsl2.patch" diff --git a/user/kst/kst-gsl2.patch b/user/kst/kst-gsl2.patch new file mode 100644 index 000000000..0edbfe7fd --- /dev/null +++ b/user/kst/kst-gsl2.patch @@ -0,0 +1,154 @@ +--- Kst-2.0.8/src/plugins/fits/non_linear.h 2014-02-13 18:41:44.000000000 +0900 ++++ Kst-2.0.8/src/plugins/fits/non_linear.h 2016-03-04 00:34:31.000000000 +0900 +@@ -177,37 +177,45 @@ + } + iIterations++; + } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); +- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); +- +- // +- // determine the fitted values... +- // +- for( i=0; i<NUM_PARAMS; i++ ) { +- dXInitial[i] = gsl_vector_get( pSolver->x, i ); +- } +- +- for( i=0; i<iLength; i++ ) { +- vectorOutYFitted->value()[i] = function_calculate( pInputX[i], dXInitial ); +- vectorOutYResiduals->value()[i] = pInputY[i] - vectorOutYFitted->value()[i]; ++ ++ ++ gsl_matrix *J = gsl_matrix_alloc(pSolver->fdf->n, pSolver->fdf->p); ++ if (J != NULL) { ++ gsl_multifit_fdfsolver_jac(pSolver, J); ++ ++ gsl_multifit_covar( J, 0.0, pMatrixCovariance ); ++ ++ // ++ // determine the fitted values... ++ // ++ for( i=0; i<NUM_PARAMS; i++ ) { ++ dXInitial[i] = gsl_vector_get( pSolver->x, i ); ++ } ++ ++ for( i=0; i<iLength; i++ ) { ++ vectorOutYFitted->value()[i] = function_calculate( pInputX[i], dXInitial ); ++ vectorOutYResiduals->value()[i] = pInputY[i] - vectorOutYFitted->value()[i]; ++ } ++ ++ // ++ // fill in the parameter values and covariance matrix... ++ // ++ for( i=0; i<NUM_PARAMS; i++ ) { ++ vectorOutYParameters->value()[i] = gsl_vector_get( pSolver->x, i ); ++ for( j=0; j<NUM_PARAMS; j++ ) { ++ vectorOutYCovariance->value()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j ); ++ } ++ } ++ ++ // ++ // determine the value of chi^2/nu ++ // ++ scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f )); ++ ++ bReturn = true; ++ ++ gsl_matrix_free( J ); + } +- +- // +- // fill in the parameter values and covariance matrix... +- // +- for( i=0; i<NUM_PARAMS; i++ ) { +- vectorOutYParameters->value()[i] = gsl_vector_get( pSolver->x, i ); +- for( j=0; j<NUM_PARAMS; j++ ) { +- vectorOutYCovariance->value()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j ); +- } +- } +- +- // +- // determine the value of chi^2/nu +- // +- scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f )); +- +- bReturn = true; +- + gsl_matrix_free( pMatrixCovariance ); + } + gsl_multifit_fdfsolver_free( pSolver ); +--- Kst-2.0.8/src/plugins/fits/non_linear_weighted.h 2014-02-13 18:41:44.000000000 +0900 ++++ Kst-2.0.8/src/plugins/fits/non_linear_weighted.h 2016-03-04 00:37:41.000000000 +0900 +@@ -193,37 +193,43 @@ + } + while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); + +- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); +- +- // +- // determine the fitted values... +- // +- for( i=0; i<NUM_PARAMS; i++ ) { +- dXInitial[i] = gsl_vector_get( pSolver->x, i ); +- } +- +- for( i=0; i<iLength; i++ ) { +- vectorOutYFitted->value()[i] = function_calculate( pInputs[XVALUES][i], dXInitial ); +- vectorOutYResiduals->value()[i] = pInputs[YVALUES][i] - vectorOutYFitted->value()[i]; +- } +- +- // +- // fill in the parameter values and covariance matrix... +- // +- for( i=0; i<NUM_PARAMS; i++ ) { +- vectorOutYParameters->value()[i] = gsl_vector_get( pSolver->x, i ); +- for( j=0; j<NUM_PARAMS; j++ ) { +- vectorOutYCovariance->value()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j ); +- } ++ gsl_matrix *J = gsl_matrix_alloc(pSolver->fdf->n, pSolver->fdf->p); ++ if (J != NULL) { ++ gsl_multifit_fdfsolver_jac(pSolver, J); ++ ++ gsl_multifit_covar( J, 0.0, pMatrixCovariance ); ++ ++ // ++ // determine the fitted values... ++ // ++ for( i=0; i<NUM_PARAMS; i++ ) { ++ dXInitial[i] = gsl_vector_get( pSolver->x, i ); ++ } ++ ++ for( i=0; i<iLength; i++ ) { ++ vectorOutYFitted->value()[i] = function_calculate( pInputs[XVALUES][i], dXInitial ); ++ vectorOutYResiduals->value()[i] = pInputs[YVALUES][i] - vectorOutYFitted->value()[i]; ++ } ++ ++ // ++ // fill in the parameter values and covariance matrix... ++ // ++ for( i=0; i<NUM_PARAMS; i++ ) { ++ vectorOutYParameters->value()[i] = gsl_vector_get( pSolver->x, i ); ++ for( j=0; j<NUM_PARAMS; j++ ) { ++ vectorOutYCovariance->value()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j ); ++ } ++ } ++ ++ // ++ // determine the value of chi^2/nu ++ // ++ scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f )); ++ ++ bReturn = true; ++ ++ gsl_matrix_free( J ); + } +- +- // +- // determine the value of chi^2/nu +- // +- scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f )); +- +- bReturn = true; +- + gsl_matrix_free( pMatrixCovariance ); + } + gsl_multifit_fdfsolver_free( pSolver ); diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD new file mode 100644 index 000000000..610907026 --- /dev/null +++ b/user/ktorrent/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ktorrent +pkgver=5.1.0 +pkgrel=0 +pkgdesc="BitTorrent client by KDE" +url="https://www.kde.org/applications/internet/ktorrent/" +arch="all" +options="!check" # Test requires X11. +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev + kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev ki18n-dev + kdbusaddons-dev kiconthemes-dev knotifications-dev knotifyconfig-dev + kcmutils-dev kparts-dev kservice-dev solid-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev libktorrent-dev taglib-dev kplotting-dev + kdnssd-dev plasma-workspace-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/ktorrent/5.1/ktorrent-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7bfe3a04a2b0f62d68b41c946af34e9f6ead6aa4ff7818a9c0ce2e83629d311e9e9be5fb1689065ce2601c43bd576b27d8c6946b845d4cdf5fa6362d53e8dd25 ktorrent-5.1.0.tar.xz" diff --git a/user/libktorrent/APKBUILD b/user/libktorrent/APKBUILD new file mode 100644 index 000000000..3912b9a57 --- /dev/null +++ b/user/libktorrent/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libktorrent +pkgver=2.1 +pkgrel=0 +pkgdesc="Torrent handling library for KDE" +url="https://www.kde.org/" +arch="all" +options="!check" # All tests require X11 +license="LGPL-2.1+" +depends="" +depends_dev="qt5-qtbase-dev karchive-dev kcrash-dev kio-dev solid-dev gmp-dev + boost-dev qca-dev" +makedepends="cmake extra-cmake-modules $depends_dev ki18n-dev" +install="" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/ktorrent/5.1/libktorrent-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4 libktorrent-2.1.tar.xz" diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD index 292947995..9f8388831 100644 --- a/user/lxqt-desktop/APKBUILD +++ b/user/lxqt-desktop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-desktop pkgver=0.12.0 -pkgrel=2 +pkgrel=3 arch="noarch" pkgdesc="Complete LXQt desktop" url="https://lxqt.org" @@ -12,7 +12,7 @@ depends="breeze breeze-icons oxygen ttf-liberation xorg-server dbus-x11 openbox lxqt-panel lxqt-runner lxqt-qtplugin qterminal pcmanfm-qt lxqt-sudo lxqt-session lxqt-powermanagement lxqt-policykit lxqt-openssh-askpass lxqt-notificationd lxqt-globalkeys lxqt-config lxqt-admin lxqt-about - lximage-qt lxqt-themes pavucontrol-qt qt5ct" + lximage-qt lxqt-themes pavucontrol-qt qt5ct obconf-qt" makedepends="" install="" subpackages="$pkgname-doc" diff --git a/user/mac-fdisk/APKBUILD b/user/mac-fdisk/APKBUILD index 24d668c07..471279968 100644 --- a/user/mac-fdisk/APKBUILD +++ b/user/mac-fdisk/APKBUILD @@ -3,7 +3,7 @@ pkgname=mac-fdisk pkgver=0.1.16 _pkgver=0.1 -pkgrel=1 +pkgrel=2 pkgdesc="68K and PowerPC fixed disk partitioning utility" url="https://adelielinux.org/" arch="all" @@ -15,6 +15,7 @@ subpackages="$pkgname-doc" source="https://distfiles.adelielinux.org/source/mac-fdisk_0.1.orig.tar.gz mac-fdisk-0.1-debian.patch mac-fdisk-0.1-headers.patch + mac-fdisk-0.1-more-arches.patch mac-fdisk-0.1_p16-ppc64.patch mac-fdisk-0.1_p16-proper-inline.patch mac-fdisk-amd64.patch @@ -42,11 +43,12 @@ package() { } sha512sums="1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120 mac-fdisk_0.1.orig.tar.gz -64261af8f98ccae559d070545ad2bd1e09dd4538e6646913ffa9030a4594667498bf430896971a9de8116e445c698368eecaa9be77e44d539f1935af45eb461a mac-fdisk-0.1-debian.patch +1d1073c4bbb6ff403130254d1ff8e1b045933c9b09e032a278bba47c50ccf1806d3c3280a818937e36942392da7b03091f00063d2bcf9f4f33cb57a8bb1166f0 mac-fdisk-0.1-debian.patch 7d16300c02b293de87101e3ef83a8b7778d15123c261d562f0129704b74d0c3d7ca18730c52d37b599ff57c0b70dacd41aeefe99cf235aea4abd4b569e3d601e mac-fdisk-0.1-headers.patch +ddee905f118d4ffa2bae0c849470f45d31baa955ae344241496863f742f7b5e00a2d458e20542138be53472f4b396461ffbcd724e98c10ca155ef38c2d39f94b mac-fdisk-0.1-more-arches.patch e521009d628934fe3925085c941d2bb3fba9c3322ccaaa6dd650ecbc6b990056f9bf186adb3a645dc8593efdb44611b69a7b6bf4e87d262870bbb515581e0ef3 mac-fdisk-0.1_p16-ppc64.patch 73b28195539a3e71b37e955f5f1e5cdc566ecf1c43a235b7689df235d84dec9d3807d3b5b49a506f758d7a1ff528388052bebfea58916381f2f0045eee350bac mac-fdisk-0.1_p16-proper-inline.patch -241576f64dd334f98e8c9cb9e0b17b6366e208f2d0af47ddb4659cf2d8e25ca8f44a84d1f7fa2e5f6215f4be42668f43f034074ac981a0d87ca8483505a3623c mac-fdisk-amd64.patch +162c5036e404519e57b63e1aee440bec4edca7fb7348efe985feeb37df9221d6829eaa601c8feb52c1ffd99cb8daf037dc93e161bb23c96927a65dd5e8b186d4 mac-fdisk-amd64.patch d558d66fb91d845e09cca7c3832d2ec078581ed09574fb38d9476f0417901794ae70e4a284379977a5c50599ce9570da8359e321de91f9f77263601c090e501d mac-fdisk-fdisk-header-musl.patch c9abc952f1ce618b085a134145fa99efa9c10b55f3fa773fb6b74a66468537bc3567ec632fe6e464c5158383135c858c171d8d94d7142d38beff39a17e31187a mac-fdisk-large-disk-support.patch b5988eb6aa64324421398461396b0fdd0b55d7643094c042bea7264ec0f9913e8a793f3f550c15928419e697a14f2932f483c4b98a54618af99b35aa7ceae757 mac-fdisk-largerthan2gb.patch diff --git a/user/mac-fdisk/mac-fdisk-0.1-debian.patch b/user/mac-fdisk/mac-fdisk-0.1-debian.patch index 73a31354b..617dd8e70 100644 --- a/user/mac-fdisk/mac-fdisk-0.1-debian.patch +++ b/user/mac-fdisk/mac-fdisk-0.1-debian.patch @@ -403,21 +403,6 @@ +.\" Jakub Jelinek (jj@sunsite.mff.cuni.cz) +.\" Andreas Neuper (ANeuper@GUUG.de) +.\" and many others. ---- mac-fdisk-0.1.orig/fdisklabel.h -+++ mac-fdisk-0.1/fdisklabel.h -@@ -52,6 +52,12 @@ - #define BSD_LABELOFFSET 0 - #define BSD_BBSIZE 0 - #define BSD_SBSIZE 0 -+#elif defined (__mc68000__) -+/* LABELSECTOR, LABELOFFSET, BBSIZE & SBSIZE are undefined for __powerpc__ */ -+#define BSD_LABELSECTOR 0 -+#define BSD_LABELOFFSET 0 -+#define BSD_BBSIZE 0 -+#define BSD_SBSIZE 0 - #else - #error unknown architecture - #endif --- mac-fdisk-0.1.orig/fdisk.c +++ mac-fdisk-0.1/fdisk.c @@ -62,7 +62,6 @@ diff --git a/user/mac-fdisk/mac-fdisk-0.1-more-arches.patch b/user/mac-fdisk/mac-fdisk-0.1-more-arches.patch new file mode 100644 index 000000000..086362844 --- /dev/null +++ b/user/mac-fdisk/mac-fdisk-0.1-more-arches.patch @@ -0,0 +1,67 @@ +--- mac-fdisk-0.1.orig/fdisklabel.h.old 1997-01-14 20:34:13.000000000 +0000 ++++ mac-fdisk-0.1.orig/fdisklabel.h 2018-06-01 06:13:09.065722112 +0000 +@@ -35,27 +35,23 @@ + #define BSD_MAXPARTITIONS 8 + #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" + +-#if defined (i386) ++/* Thanks, util-linux! */ ++#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) + #define BSD_LABELSECTOR 1 + #define BSD_LABELOFFSET 0 +-#define BSD_BBSIZE 8192 /* size of boot area, with label */ +-#define BSD_SBSIZE 8192 /* max size of fs superblock */ +-#elif defined (__alpha__) +-#error LABELSECTOR, LABELOFFSET, BBSIZE & SBSIZE are undefined for __alpha__ +-#define BSD_LABELSECTOR 0 +-#define BSD_LABELOFFSET 0 +-#define BSD_BBSIZE 0 +-#define BSD_SBSIZE 0 +-#elif defined (__powerpc__) +-/* LABELSECTOR, LABELOFFSET, BBSIZE & SBSIZE are undefined for __powerpc__ */ ++#elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__) + #define BSD_LABELSECTOR 0 ++#define BSD_LABELOFFSET 64 ++#elif defined (__s390__) || defined (__s390x__) ++#define BSD_LABELSECTOR 1 + #define BSD_LABELOFFSET 0 +-#define BSD_BBSIZE 0 +-#define BSD_SBSIZE 0 + #else + #error unknown architecture + #endif + ++#define BSD_BBSIZE 8192 /* size of boot area, with label */ ++#define BSD_SBSIZE 8192 /* max size of fs superblock */ ++ + struct disklabel { + u_long d_magic; /* the magic number */ + short d_type; /* drive type */ +--- mac-fdisk-0.1.orig/fdisklabel.c.old 2018-06-01 06:19:35.113347714 +0000 ++++ mac-fdisk-0.1.orig/fdisklabel.c 2018-06-01 06:20:36.734576024 +0000 +@@ -82,10 +82,8 @@ + + static struct disklabel bsd_dlabel; + static char buffer[BSD_BBSIZE]; +-#if defined (i386) + static struct partition *bsd_part; + static int bsd_part_index; +-#endif + + void + bmenu (void) +@@ -373,10 +371,11 @@ + while (1) + if ((c = tolower (read_char ("Do you want to create a disklabel? (y/n) "))) == 'y') + { +-#if defined (i386) +- if (bsd_initlabel (bsd_part, &bsd_dlabel, bsd_part_index) == 1) +-#elif defined (__alpha__) || defined (__powerpc__) || defined (__mc68000__) ++#if defined (__alpha__) || defined (__powerpc__) || defined (__hppa__) || \ ++ defined (__s390__) || defined (__s390x__) || defined(__mc68000__) + if (bsd_initlabel (NULL, &bsd_dlabel, 0) == 1) ++#else ++ if (bsd_initlabel (bsd_part, &bsd_dlabel, bsd_part_index) == 1) + #endif + { + bsd_print_disklabel (1); diff --git a/user/mac-fdisk/mac-fdisk-amd64.patch b/user/mac-fdisk/mac-fdisk-amd64.patch index 8658ba9a6..236b037d9 100644 --- a/user/mac-fdisk/mac-fdisk-amd64.patch +++ b/user/mac-fdisk/mac-fdisk-amd64.patch @@ -9,15 +9,6 @@ static int bsd_translate_fstype (int linux_type); static void bsd_link_part (void); #endif -@@ -82,7 +82,7 @@ - - static struct disklabel bsd_dlabel; - static char buffer[BSD_BBSIZE]; --#if defined (i386) -+#if defined (i386) || defined (__amd64) - static struct partition *bsd_part; - static int bsd_part_index; - #endif @@ -99,13 +99,13 @@ " n add a new BSD partition\n" " p print BSD partition table\n" @@ -88,15 +79,6 @@ fprintf (stderr, "%s%d contains no disklabel.\n", disk_device, bsd_part_index+1); #elif defined (__alpha__) || defined (__powerpc__) -@@ -376,7 +376,7 @@ - while (1) - if ((c = tolower (read_char ("Do you want to create a disklabel? (y/n) "))) == 'y') - { --#if defined (i386) -+#if defined (i386) || defined(__amd64) - if (bsd_initlabel (bsd_part, &bsd_dlabel, bsd_part_index) == 1) - #elif defined (__alpha__) || defined (__powerpc__) || defined (__mc68000__) - if (bsd_initlabel (NULL, &bsd_dlabel, 0) == 1) @@ -507,7 +507,7 @@ bcopy (&dl, d, sizeof (struct disklabel)); @@ -160,17 +142,6 @@ static int bsd_translate_fstype (int linux_type) { ---- a/fdisklabel.h -+++ b/fdisklabel.h -@@ -35,7 +35,7 @@ - #define BSD_MAXPARTITIONS 8 - #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" - --#if defined (i386) -+#if defined (i386) || defined(__amd64) - #define BSD_LABELSECTOR 1 - #define BSD_LABELOFFSET 0 - #define BSD_BBSIZE 8192 /* size of boot area, with label */ --- a/kernel-defs.h +++ b/kernel-defs.h @@ -15,8 +15,14 @@ diff --git a/user/man-db/APKBUILD b/user/man-db/APKBUILD index ff748ba3f..a645b2b7e 100644 --- a/user/man-db/APKBUILD +++ b/user/man-db/APKBUILD @@ -8,8 +8,9 @@ url="http://www.nongnu.org/man-db/" arch="all" license="GPL-2+" depends="groff less" -makedepends="db-dev gettext-dev libpipeline-dev zlib-dev" -subpackages="$pkgname-lang $pkgname-doc" +makedepends_host="db-dev gettext-dev libpipeline-dev zlib-dev" +subpackages="$pkgname-doc" +[ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-lang" options="!check" # requires //IGNORE in iconv source="http://download.savannah.nongnu.org/releases/man-db/man-db-$pkgver.tar.xz man-db.trigger diff --git a/user/minivmac/APKBUILD b/user/minivmac/APKBUILD new file mode 100644 index 000000000..56e7814f4 --- /dev/null +++ b/user/minivmac/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Horst Burkhardt <horst@adelielinux.org> +# Maintainer: Horst Burkhardt <horst@adelielinux.org> +pkgname=minivmac +pkgver=3.5.8 +pkgrel=1 +pkgdesc="a simple and accurate emulator of early Macintosh computers" +url="http://www.gryphel.com/c/minivmac/" +arch="all !s390x" +options="!check" # minivmac does not ship a test suite +license="GPL-2.0-only" +depends="" +makedepends="libx11-dev libxcb-dev libxau-dev libbsd-dev libxdmcp-dev" +source="http://oddball.tech/code/emu_pkg/$pkgname-$pkgver.tar.xz" + +build() { + cd "$builddir" + CARCH=$CARCH ./configure + cd "$builddir"/mnvmplus + make -j1 + cd "$builddir"/mnvmII + make -j1 +} + +package() { + install -D -m755 "$builddir"/mnvmplus/minivmac "$pkgdir"/usr/bin/minivmac + install -m755 "$builddir"/mnvmII/minivmac "$pkgdir"/usr/bin/minivmacII +} + +sha512sums="ff28266641dd37df74c84c16c8bf32282729d55ae6512d4a98abf92ba40692f9fc107b501f072755ba0f8a0322d4f755915d9be74a407ce89af94bfd24d11043 minivmac-3.5.8.tar.xz" diff --git a/user/ntp/APKBUILD b/user/ntp/APKBUILD new file mode 100644 index 000000000..a5410b4c9 --- /dev/null +++ b/user/ntp/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +# TODO: split oneoff client packages to subpackage, add openrc subpackage, add sample config with no listeners +pkgname=ntp +pkgver=4.2.8p11 +pkgrel=0 +pkgdesc="an implementation of RFC-5905 (NTPv4)" +url="http://www.ntp.org/" +arch="all" +license="BSD-2-Clause" +depends="" +makedepends="openssl-dev libedit-dev libevent-dev" +subpackages="$pkgname-dbg $pkgname-doc" +source="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/$pkgname-${pkgver%.*}/$pkgname-$pkgver.tar.gz" +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-lineeditlibs=edit \ + --enable-system-libevent \ + --enable-debugging \ + --enable-ipv6 \ + --with-crypto \ + --enable-autokey + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="05ac60f15a6aac50aaf340d40e4e439a421fa6e3d897bf30a69b2cef0cc97f8a6956012bfc6ceba055f4c3485a24f7fb8ebbd055e1875f1c69cbfdc35e71f236 ntp-4.2.8p11.tar.gz" diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD new file mode 100644 index 000000000..394c4cb9e --- /dev/null +++ b/user/obconf-qt/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=obconf-qt +pkgver=0.12.0 +pkgrel=0 +pkgdesc="Qt5-based Openbox configuration tool" +url="http://lxqt.org" +arch="all" +license="GPL-2.0" +depends="" +depends_dev="" +makedepends="cmake extra-cmake-modules lxqt-build-tools openbox-dev liblxqt-dev qt5-qttools-dev $depends_dev" +install="" +source="https://github.com/lxqt/obconf-qt/releases/download/$pkgver/obconf-qt-$pkgver.tar.xz" +builddir="$srcdir/obconf-qt-$pkgver" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DPULL_TRANSLATIONS=False \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="087d453d111c4aa5e9be7e03b1253192bf8c274bbee822f0c9bc9375fef79763c48cba0096ce153b1da3a6fe59429d228ffe3611746cfa20d0193232768f372e obconf-qt-0.12.0.tar.xz" diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index d53e6825a..060956c19 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -41,6 +41,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING=OFF \ ${CMAKE_CROSSOPTS} make } diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index 8da9a35ac..e28f03984 100644 --- a/user/plasma-workspace/APKBUILD +++ b/user/plasma-workspace/APKBUILD @@ -43,6 +43,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING=OFF \ ${CMAKE_CROSSOPTS} make } diff --git a/user/pm-quirks/APKBUILD b/user/pm-quirks/APKBUILD new file mode 100644 index 000000000..fccbb4844 --- /dev/null +++ b/user/pm-quirks/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=pm-quirks +pkgver=20100619 +pkgrel=0 +pkgdesc="Quirks data for pm-utils" +url="https://pm-utils.freedesktop.org/wiki/" +arch="noarch" +license="GPL-2.0-only" # same as pm-utils, hopefully +depends="pm-utils" +makedepends="" +subpackages="" +options="!check" # this is a bunch of data files for pm-utils, nothing to check +source="http://pm-utils.freedesktop.org/releases/$pkgname-$pkgver.tar.gz" + +package() { + cd "$srcdir" + install -m755 -d ${pkgdir}/usr/lib/pm-utils/video-quirks + install -m644 video-quirks/*.quirkdb ${pkgdir}/usr/lib/pm-utils/video-quirks/ +} + +sha512sums="e20244fb72475945e08010d7ec19db2c017c1a04fa01d3d08c03d704d7f07f9c087bac6a5a44242cc8ed6cec5db47bc06a8862dd0f74088a565d37b6d7b95afc pm-quirks-20100619.tar.gz" diff --git a/user/ponysay/APKBUILD b/user/ponysay/APKBUILD index 9e2001359..b7aa70d63 100644 --- a/user/ponysay/APKBUILD +++ b/user/ponysay/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ponysay pkgver=3.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="Like cowsay, but with horses" url="https://github.com/erkin/ponysay" arch="noarch" @@ -26,8 +26,8 @@ check() { package() { cd "$builddir" - python setup.py install --prefix=/usr --destdir="$pkgdir" --with-man \ - --freedom=sloppy --without-fish + python3 setup.py install --prefix=/usr --destdir="$pkgdir" --with-man \ + --freedom=sloppy --without-fish --with-custom-env-python=python3 } bashcomp() { diff --git a/user/psmisc/APKBUILD b/user/psmisc/APKBUILD index 42ef3e51d..01aa02009 100644 --- a/user/psmisc/APKBUILD +++ b/user/psmisc/APKBUILD @@ -8,9 +8,11 @@ pkgdesc="Miscellaneous utilities that use the proc filesystem" url="https://gitlab.com/psmisc/psmisc" arch="all" license="GPLv2+" -makedepends="ncurses-dev gettext-dev autoconf>=2.69 automake" +makedepends_build="autoconf>=2.69 automake gettext-dev" +makedepends_host="ncurses-dev gettext-dev" checkdepends="dejagnu" -subpackages="$pkgname-doc $pkgname-lang" +subpackages="$pkgname-doc" +[ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-lang" source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/$pkgname/$pkgname/repository/archive.tar.bz2?ref=v$pkgver dont-underlink-peekfd.patch fix-peekfd-on-ppc.patch @@ -39,7 +41,9 @@ build() { --localstatedir=/var \ --enable-harden-flags \ --enable-ipv6 \ - --disable-selinux # is SELinux on Alpine a thing? + --disable-selinux \ + ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes make } diff --git a/user/py3-random2/APKBUILD b/user/py3-random2/APKBUILD new file mode 100644 index 000000000..631fd4d26 --- /dev/null +++ b/user/py3-random2/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-random2 +_pkgname=random2 +pkgver=1.0.1 +pkgrel=0 +pkgdesc="A Python module implementing Python 2's RNG" +url="https://pypi.python.org/pypi/random2" +arch="noarch" +license="Python-2.0" +depends="python3" +makedepends="py3-setuptools python3-dev" +install="" +source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.zip" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + cd "$builddir" + python3 setup.py build +} + +check() { + cd "$builddir" + PYTHONPATH="build/lib" python3 setup.py test +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="31de31c27bc6e07e99c24d30e97d9ddc3085fe557bcb0725881d4ab0b4c06e6208f64ba6267098c7b1be4f115ad45b399e841beecc90f71da2fb7d82982e75ff py3-random2-1.0.1.zip" diff --git a/user/quassel/APKBUILD b/user/quassel/APKBUILD new file mode 100644 index 000000000..7c9e999a9 --- /dev/null +++ b/user/quassel/APKBUILD @@ -0,0 +1,74 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=quassel +pkgver=0.12.4 +pkgrel=0 +pkgdesc="Modern, cross-platform IRC client" +url="https://quassel-irc.org/" +arch="all" +license="GPL-3.0+" +depends="$pkgname-client $pkgname-core" +makedepends="qt5-qtbase-dev qt5-qtmultimedia-dev libdbusmenu-qt-dev sonnet-dev + extra-cmake-modules kconfigwidgets-dev kcoreaddons-dev kxmlgui-dev + knotifications-dev knotifyconfig-dev ktextwidgets-dev qt5-qtscript-dev + kwidgetsaddons-dev qca-dev qt5-qttools-dev zlib-dev libexecinfo-dev" +install="" +langdir="/usr/share/quassel/translations" +subpackages="$pkgname-core $pkgname-client $pkgname-lang" +source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2" +builddir="$srcdir/quassel-$pkgver" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DUSE_QT5=ON \ + -DWITH_KDE=ON \ + -DWITH_WEBENGINE=OFF \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +client() { + pkgdesc="Modern, cross-platform IRC client (Thin client only)" + depends="" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/quasselclient "$subpkgdir"/usr/bin/ + + local dir + for dir in {applications,icons,pixmaps,knotifications5}; do + mkdir -p "$subpkgdir"/usr/share/$dir + mv "$pkgdir"/usr/share/$dir "$subpkgdir"/usr/share/ + done + + mkdir -p "$subpkgdir"/usr/share/quassel + mv "$pkgdir"/usr/share/quassel/stylesheets \ + "$subpkgdir"/usr/share/quassel/ +} + +core() { + pkgdesc="Modern, cross-platform IRC daemon (core only)" + depends="" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/quasselcore "$subpkgdir"/usr/bin/ +} + +sha512sums="66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92 quassel-0.12.4.tar.bz2" diff --git a/user/rc/APKBUILD b/user/rc/APKBUILD new file mode 100644 index 000000000..c949968fa --- /dev/null +++ b/user/rc/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=rc +pkgver=1.7.4 +pkgrel=0 +pkgdesc="a reimplementation of the Plan 9 shell" +url="http://tobold.org/article/rc" +arch="all" +license="Zlib" +depends="" +makedepends="libedit-dev" +install="" +subpackages="$pkgname-doc" +source="http://static.tobold.org/$pkgname/$pkgname-$pkgver.tar.gz" +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/ \ + --localstatedir=/var \ + --with-edit=edit + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + mkdir ${pkgdir}/usr/share/man + mv ${pkgdir}/usr/share/man1 ${pkgdir}/usr/share/man +} + +sha512sums="49e124207b5370b88b8fba0376dda33451451a58bfb85fabfc06ae59eb88fedf38d7aeaaf292e4f380e2c00efc8301ba68d12180923186d1c53ef94f78f7e435 rc-1.7.4.tar.gz" diff --git a/user/sharutils/APKBUILD b/user/sharutils/APKBUILD index 6aaf2629e..5aa36a130 100644 --- a/user/sharutils/APKBUILD +++ b/user/sharutils/APKBUILD @@ -7,9 +7,10 @@ pkgrel=0 pkgdesc="Utilities for manipulating shell archives" url="https://www.gnu.org/software/sharutils/" arch="all" -license="GPLv3+" +license="GPL-3.0+" depends="bzip2" -makedepends="gettext-dev texinfo" +makedepends_build="texinfo" +makedepends_host="gettext-dev" subpackages="$pkgname-lang $pkgname-doc" source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz" diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD index 782061ea3..f516c34be 100644 --- a/user/thunderbird/APKBUILD +++ b/user/thunderbird/APKBUILD @@ -32,6 +32,7 @@ source="https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thun profiler.patch proper-system-hunspell.patch stab.h + stackwalk-x86-ppc.patch thunderbird.desktop " somask="liblgpllibs.so @@ -87,4 +88,5 @@ sha512sums="80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a 7e72b96196f51cc02478f1802a10b1c1754db09d7d35aef697c5dcaace107e7a45a1b97256cc98b4aa728845694be093b148b61868e8ebfc8317fea19d6c71fa profiler.patch 63b09028262a109e3a02f928c12323793df65dbd6d5605ddc315978b50ff4b50f6d1af410dc7c00538c80009a8721900c6320b166c8aa9bc6dce170ebcd6fc91 proper-system-hunspell.patch 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h +d620a1efa4b079ce082a27cfacbae275aceb3d268fd44bfd3f4b742b8098c8e1b1733edd360404c5109137c508b8426ed9e1ca1036b11752de8d1f429bf14844 stackwalk-x86-ppc.patch 95a2b1deb4f6c90750fdd2bfe8ca0a7879a5b267965091705a6beb0a0a4b1ccad75d11df7b9885543ca4232ff704e975c6946f4c11804cb71c471e06f9576001 thunderbird.desktop" diff --git a/user/thunderbird/stackwalk-x86-ppc.patch b/user/thunderbird/stackwalk-x86-ppc.patch new file mode 100644 index 000000000..9428e7238 --- /dev/null +++ b/user/thunderbird/stackwalk-x86-ppc.patch @@ -0,0 +1,16 @@ +--- thunderbird-52.6.0/mozilla/mozglue/misc/StackWalk.cpp ++++ thunderbird-52.6.0/mozilla/mozglue/misc/StackWalk.cpp +@@ -41,13 +41,7 @@ static CriticalAddress gCriticalAddress; + #define MOZ_STACKWALK_SUPPORTS_MACOSX 0 + #endif + +-#if (defined(linux) && \ +- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ +- defined(HAVE__UNWIND_BACKTRACE))) +-#define MOZ_STACKWALK_SUPPORTS_LINUX 1 +-#else + #define MOZ_STACKWALK_SUPPORTS_LINUX 0 +-#endif + + #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) + #define HAVE___LIBC_STACK_END 1 |