cinnamon: update to 3.8.x (#329)

* mozjs38: remove

* cjs: update to 3.8.0.

* cinnamon-translations: update to 3.8.1.

* cinnamon-menus: update to 3.8.2.

* cinnamon-desktop: update to 3.8.1.

* cinnamon-screensaver: update to 3.8.2.

* nemo: update to 3.8.3.

* muffin: update to 3.8.1.

* cinnamon-settings-daemon: update to 3.8.4.

* cinnamon-control-center: update to 3.8.0.

* cinnamon-session: update to 3.8.1.

* New package: python3-pam-1.8.3

* cinnamon: update to 3.8.4.

* xapps: add mising devel dependencies
This commit is contained in:
John Zimmermann 2018-06-25 20:02:24 +02:00 committed by cr6git
parent 7358d02380
commit df94b7727a
24 changed files with 269 additions and 442 deletions

View file

@ -1551,7 +1551,6 @@ libwx_gtk2u_webview-3.0.so.0 wxWidgets-3.0.2_3
libmspack.so.0 libmspack-0.4alpha_1
libslim.so.1.3.6 slim-1.3.6_1
libmozjs-24.so mozjs24-24.2.0_1
libmozjs-38.so mozjs38-38.8.0_1
libmediaart-2.0.so.0 libmediaart-1.9.1_1
libinput.so.10 libinput-1.2.0_1
libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1

View file

@ -1,25 +1,28 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=3.6.5
revision=2
version=3.8.0
revision=1
short_desc="The Cinnamon Control Center"
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel glib-devel intltool xmlto docbook-xsl gtk-doc autoconf-archive"
makedepends="dbus-glib-devel cinnamon-menus-devel libgnomekbd-devel
cinnamon-desktop-devel cinnamon-settings-daemon-devel libXxf86misc-devel
network-manager-applet-devel libSM-devel libnotify-devel upower-devel
polkit-devel colord-devel ibus-devel pulseaudio-devel libwacom-devel tzdata
libcanberra-devel cups-devel ModemManager-devel network-manager-applet-devel
gnome-online-accounts-devel"
hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
gobject-introspection intltool pkg-config"
makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=298daf3f0f01af11b63a57c59f0ee62cc0cb16a12b498bdd45fd92e6d32754aa
checksum=7e839b2ca42aec23a47a844f8ba48f8846eabe19ccc9fa1aaeae4a9f742e87df
do_check() {
:
}
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

View file

@ -0,0 +1,114 @@
--- libcinnamon-desktop/meson.build 2018-05-06 16:37:39.000000000 +0200
+++ - 2018-05-09 19:03:26.854206934 +0200
@@ -1,21 +1,3 @@
-libcinnamon_desktop_gir_sources = [
- 'display-name.c',
- 'edid-parse.c',
- 'gnome-bg-crossfade.c',
- 'gnome-bg.c',
- 'gnome-desktop-thumbnail.c',
- 'gnome-desktop-utils.c',
- 'gnome-installer.c',
- 'gnome-pnp-ids.c',
- 'gnome-rr-config.c',
- 'gnome-rr-labeler.c',
- 'gnome-rr-output-info.c',
- 'gnome-rr.c',
- 'gnome-thumbnail-pixbuf-utils.c',
- 'gnome-wall-clock.c',
- 'gnome-xkb-info.c',
-]
-
libcinnamon_desktop_misc_headers = [
'gnome-datetime-source.h',
'gnome-rr-private.h',
@@ -81,31 +63,6 @@
)
endif
-cdesktop_gir = gnome.generate_gir(libcinnamon_desktop,
- sources: 'cdesktop-enums.h',
- namespace: 'CDesktopEnums',
- nsversion: '3.0',
- identifier_prefix: 'CDesktop',
- symbol_prefix: 'c_desktop',
- extra_args: [
- '-DGNOME_DESKTOP_USE_UNSTABLE_API',
- ],
- install: true,
-)
-
-gnome.generate_gir(libcinnamon_desktop,
- sources: libcinnamon_desktop_gir_sources + libcinnamon_desktop_headers,
- namespace: 'CinnamonDesktop',
- nsversion: '3.0',
- export_packages: 'cinnamon-desktop',
- identifier_prefix: 'Gnome',
- symbol_prefix: 'gnome_',
- includes: ['GObject-2.0', 'Gtk-3.0', cdesktop_gir[0], ],
- extra_args: [
- '-DGNOME_DESKTOP_USE_UNSTABLE_API',
- ],
- install: true,
-)
# FIXME
# https://github.com/mesonbuild/meson/issues/1687
--- libcvc/meson.build 2018-05-06 16:37:39.000000000 +0200
+++ - 2018-05-09 19:07:38.048845300 +0200
@@ -1,24 +1,9 @@
-libcvc_gir_sources = [
- 'gvc-channel-map.c',
- 'gvc-mixer-card.c',
- 'gvc-mixer-control.c',
- 'gvc-mixer-event-role.c',
- 'gvc-mixer-event-role.h',
- 'gvc-mixer-sink-input.c',
- 'gvc-mixer-sink.c',
- 'gvc-mixer-sink.h',
- 'gvc-mixer-source-output.c',
- 'gvc-mixer-source.c',
- 'gvc-mixer-stream.c',
- 'gvc-mixer-ui-device.c',
-]
libcvc_sources = [
'gvc-channel-map-private.h',
'gvc-mixer-card-private.h',
'gvc-mixer-control-private.h',
'gvc-mixer-stream-private.h',
'gvc-pulseaudio-fake.h',
- libcvc_gir_sources,
]
libcvc_headers = [
@@ -44,20 +29,6 @@
version: '0.0.0',
)
-gnome.generate_gir(libcvc,
- sources: libcvc_gir_sources + libcvc_headers,
- namespace: 'Cvc',
- nsversion: '1.0',
- identifier_prefix: 'Gvc',
- symbol_prefix: 'gvc_',
- includes: [
- 'GObject-2.0',
- 'Gio-2.0',
- ],
- install: true,
-)
-
-
install_headers(
libcvc_headers,
subdir: join_paths('cinnamon-desktop', 'libcvc'),
--- libcinnamon-desktop/meson.build 2018-05-09 19:08:56.864652942 +0200
+++ - 2018-05-09 19:09:17.874779723 +0200
@@ -6,7 +6,6 @@
]
libcinnamon_desktop_sources = [
- libcinnamon_desktop_gir_sources,
libcinnamon_desktop_misc_headers,
'gnome-datetime-source.c',
]

View file

@ -1,22 +0,0 @@
--- schemas/org.cinnamon.desktop.background.gschema.xml.in.in 2014-10-01 03:54:35.830124486 +0000
+++ schemas/org.cinnamon.desktop.background.gschema.xml.in.in 2014-10-01 03:58:31.959359594 +0000
@@ -10,7 +10,7 @@
</_description>
</key>
<key name="picture-uri" type="s">
- <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
+ <default>'file://@datadir@/backgrounds/gnome/adwaita-timed.xml'</default>
<_summary>Picture URI</_summary>
<_description>
URI to use for the background image. Not that the backend only supports
--- schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2014-10-01 03:54:35.830124486 +0000
+++ schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2014-10-01 03:58:35.266015393 +0000
@@ -97,7 +97,7 @@
</_description>
</key>
<key name="icon-theme" type="s">
- <default>'gnome'</default>
+ <default>'Adwaita'</default>
<_summary>Icon Theme</_summary>
<_description>
Icon theme to use for the panel, nautilus etc.

View file

@ -1,30 +1,25 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
version=3.6.2
version=3.8.1
revision=1
short_desc="Library with common API for various Cinnamon modules"
build_style=gnu-configure
configure_args=" --disable-static"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel glib-devel intltool"
makedepends="gdk-pixbuf-devel gtk+3-devel libXrandr-devel xkeyboard-config
libxkbfile-devel pulseaudio-devel pam-devel accountsservice-devel"
build_style=meson
hostmakedepends="glib-devel gobject-introspection intltool pkg-config"
makedepends="accountsservice-devel gtk+3-devel libxkbfile-devel pam-devel
pulseaudio-devel"
depends="xkeyboard-config"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=76b053eea02c61df22d35ccec6ba83de25246b794cbc024dce636dcb1e74c812
checksum=239c8a210de18468919d9cbc379535e55628559e396cb321100ccab4ee0d04d0
nocross=yes
build_options="gir"
if [ -z "$CROSS_BUILD" ]; then
build_options_default="gir"
fi
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"

View file

@ -1,17 +1,18 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
version=3.6.0
version=3.8.2
revision=1
short_desc="Cinnamon menu specifications"
build_style=gnu-configure
configure_args=" --disable-static"
hostmakedepends="automake libtool gnome-common pkg-config intltool gobject-introspection glib-devel"
hostmakedepends="glib-devel gnome-common gobject-introspection intltool
pkg-config"
makedepends="libglib-devel"
short_desc="Cinnamon menu specifications"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=ac005b0b46fb6285f82b2f80683c7d5cdd719cb7548a4dc3e36f0cd717e38d00
checksum=21de1b1b7367afcd7ccf9bc54633f495f30c26819da459de78b4a79fe4134725
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

View file

@ -1,30 +1,35 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
version=3.6.1
revision=2
version=3.8.2
revision=1
short_desc="The Cinnamon screensaver"
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --with-mit-ext"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel glib-devel intltool python3-devel"
makedepends="dbus-glib-devel libgnomekbd-devel cinnamon-desktop-devel
libXxf86misc-devel pam-devel webkit2gtk-devel python3-devel"
depends="cinnamon-translations desktop-file-utils hicolor-icon-theme
python3-gobject xapps python3-setproctitle python3-xapp"
hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection
intltool pkg-config python3-devel"
makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
libgnomekbd-devel pam-devel python3-devel webkit2gtk-devel"
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=aeb3edb07f6e9a0f9aa0e291c82c26b12335dfe78fea6a32edb4ff1d049ca728
checksum=6f07d2a13d81794d4654d04a9cb9c80ed02fccf7031747a2dfe4bf3f455ac2ca
nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
pycompile_dirs="/usr/share/cinnamon-screensaver"
do_check() {
:
}
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
post_install() {
vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}
}

View file

@ -1,27 +1,18 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
version=3.6.1
version=3.8.1
revision=1
short_desc="The Cinnamon session handler"
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool"
build_style=meson
hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
elogind-devel GConf-devel libXtst-devel"
elogind-devel GConf-devel libXtst-devel xapps-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=1de855afe097c2fe4d63f0edd4f8876ace2d73620edb65b3c665e91e5a115d9e
checksum=c5ddf1ee820a2d76f0515905b85a998e80fcbc586c1fd41ad2652aa18e1755fe
if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
# Fix gcc6 build for -Wformat-nonliteral
CFLAGS="-Wno-error=format-nonliteral"
fi
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}

View file

@ -1,27 +1,30 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
version=3.6.2
revision=3
version=3.8.3
revision=1
short_desc="The Cinnamon Settings Daemon"
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile --disable-gconf"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel glib-devel dbus-glib-devel intltool xmlto docbook-xml"
makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel
libnotify-devel cinnamon-desktop-devel lcms2-devel ibus-devel nss-devel
pulseaudio-devel libcanberra-devel colord-devel cups-devel polkit-devel
libgnomekbd-devel libxklavier-devel xorgproto elogind-devel libgudev-devel"
hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
gobject-introspection intltool pkg-config"
makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=60f4de4eb1e05d720605dbd6f90bb841039be00ca1ad4f2bedaf39725ea34339
checksum=4bfa74892e97e0a9b847f4711807c1e5fe3f1ab9d20b1bd0d9c8ee3821b98fa1
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
do_check() {
:
}
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
depends="libglib-devel"

View file

@ -1,15 +1,16 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
version=3.6.4
version=3.8.1
revision=1
noarch=yes
build_style=gnu-makefile
short_desc="Translations for Cinnamon and Nemo"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="GPL-2.0-or-later"
#changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=8f993ae34e3f176dc3182c2e95d1dfa1bb4e0dfd8a71933e3670718834aeec62
checksum=99fe1885659c68e9518186ad0152decd9e16065f5e3845ff01e455aa76db9b8c
do_install() {
vmkdir /usr/share/locale

View file

@ -1,14 +1,14 @@
# Template file for 'cinnamon'
pkgname=cinnamon
version=3.6.7
revision=2
version=3.8.4
revision=1
wrksrc="Cinnamon-${version}"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel glib-devel intltool xmlto docbook-xml gtk-doc autoconf-archive"
hostmakedepends="automake libtool pkg-config gobject-introspection
gettext-devel glib-devel intltool xmlto gtk-doc autoconf-archive"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel
@ -19,14 +19,15 @@ depends="
cinnamon-session>=${version%.*} muffin>=${version%.*}
cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*}
cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
python-cairo python-dbus python-pam python-pexpect python-inotify python-lxml python-Pillow
polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus"
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=ddd29e1a2e044dfa54a5c57b21f9704512845824a101eca37266109560c70d08
checksum=823737315fbbdbf9cdf27b1184abdbc15b9fda889c4126b081e0b94298f49917
nocross="gobject-introspection"
pycompile_dirs="
/usr/share/cinnamon/cinnamon-slideshow
@ -38,13 +39,14 @@ pycompile_dirs="
/usr/share/cinnamon/cinnamon-json-makepot
/usr/share/cinnamon/cinnamon-desktop-editor"
do_check() {
:
}
pre_configure() {
# Add polkit agent to required components
sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
# fix for the python2 PAM module
sed -i 's:import PAM:import pam:' files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
# Use pkexec instead of gksu
sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users

View file

@ -1,23 +1,34 @@
# Template file for 'cjs'
pkgname=cjs
version=3.6.1
version=3.8.0
revision=1
short_desc="Javascript for Cinnamon"
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
gobject-introspection glib-devel"
makedepends="mozjs38-devel dbus-glib-devel readline-devel gobject-introspection"
makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
checksum=874b473cff62e2adaeca2135f0b2eab5efe1e397ce24ea816d92aafef1a5c845
checksum=9018ec1ffc0c2c81c9678a23e3e57db56251b4bbf6b2a10e79aa75e83ca86d66
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
do_check() {
:
# TOTAL: 729
# PASS: 707
# SKIP: 14
# XFAIL: 0
# FAIL: 3
# XPASS: 0
# ERROR: 5
}
cjs-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"

View file

@ -1 +0,0 @@
mozjs38

View file

@ -1,20 +0,0 @@
Description: Copy headers on install instead of symlinking
Author: Rico Tzschichholz <ricotz@ubuntu.com>
Forwarded: no
Last-Update: 2014-10-29
---
Index: b/python/mozbuild/mozbuild/backend/recursivemake.py
===================================================================
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -796,7 +796,7 @@
return
for source, dest, _ in self._walk_hierarchy(obj, exports):
- self._install_manifests['dist_include'].add_symlink(source, dest)
+ self._install_manifests['dist_include'].add_copy(source, dest)
if not os.path.exists(source):
raise Exception('File listed in EXPORTS does not exist: %s' % source)

View file

@ -1,16 +0,0 @@
Add bracket for sed 4.3 compliance
Based on upstream fix by Daniel Stenberg in 09 jan 2017
See: https://hg.mozilla.org/mozilla-central/rev/ebcbf47a83e7
--- a/js/src/configure 2017-02-21 16:56:42.350105741 -0300
+++ b/js/src/configure 2017-02-21 17:33:13.183493978 -0300
@@ -15231,7 +15231,7 @@
fi
fi
- version=`sed -n 's/^[:space:]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+ version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
if test x"$version" = x; then
{ echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; }
fi

View file

@ -1,122 +0,0 @@
--- a/js/src/jit/RegisterSets.h 2017-02-10 17:33:06.210702431 -0800
+++ b/js/src/jit/RegisterSets.h 2017-02-10 17:43:52.877514146 -0800
@@ -7,7 +7,6 @@
#ifndef jit_RegisterSets_h
#define jit_RegisterSets_h
-#include "mozilla/Alignment.h"
#include "mozilla/MathAlgorithms.h"
#include "jit/JitAllocPolicy.h"
@@ -26,8 +25,8 @@
Code code_;
public:
- AnyRegister()
- { }
+ AnyRegister() = default;
+
explicit AnyRegister(Register gpr) {
code_ = gpr.code();
}
@@ -156,7 +155,7 @@
}
#endif
- ValueOperand() {}
+ ValueOperand() = default;
};
// Registers to hold either either a typed or untyped value.
@@ -165,46 +164,25 @@
// Type of value being stored.
MIRType type_;
- // Space to hold either an AnyRegister or a ValueOperand.
union U {
- mozilla::AlignedStorage2<AnyRegister> typed;
- mozilla::AlignedStorage2<ValueOperand> value;
+ AnyRegister typed;
+ ValueOperand value;
} data;
- AnyRegister& dataTyped() {
- MOZ_ASSERT(hasTyped());
- return *data.typed.addr();
- }
- ValueOperand& dataValue() {
- MOZ_ASSERT(hasValue());
- return *data.value.addr();
- }
-
- AnyRegister dataTyped() const {
- MOZ_ASSERT(hasTyped());
- return *data.typed.addr();
- }
- const ValueOperand& dataValue() const {
- MOZ_ASSERT(hasValue());
- return *data.value.addr();
- }
-
public:
- TypedOrValueRegister()
- : type_(MIRType_None)
- {}
+ TypedOrValueRegister() = default;
TypedOrValueRegister(MIRType type, AnyRegister reg)
: type_(type)
{
- dataTyped() = reg;
+ data.typed = reg;
}
MOZ_IMPLICIT TypedOrValueRegister(ValueOperand value)
: type_(MIRType_Value)
{
- dataValue() = value;
+ data.value = value;
}
MIRType type() const {
@@ -220,11 +198,13 @@
}
AnyRegister typedReg() const {
- return dataTyped();
+ MOZ_ASSERT(hasTyped());
+ return data.typed;
}
ValueOperand valueReg() const {
- return dataValue();
+ MOZ_ASSERT(hasValue());
+ return data.value;
}
AnyRegister scratchReg() {
@@ -240,19 +220,18 @@
// Whether a constant value is being stored.
bool constant_;
- // Space to hold either a Value or a TypedOrValueRegister.
union U {
- mozilla::AlignedStorage2<Value> constant;
- mozilla::AlignedStorage2<TypedOrValueRegister> reg;
+ Value constant;
+ TypedOrValueRegister reg;
} data;
Value& dataValue() {
MOZ_ASSERT(constant());
- return *data.constant.addr();
+ return data.constant;
}
TypedOrValueRegister& dataReg() {
MOZ_ASSERT(!constant());
- return *data.reg.addr();
+ return data.reg;
}
public:

View file

@ -1,65 +0,0 @@
# HG changeset patch
# Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a
Add major version to shell and js-config filenames.
Author: Rico Tzschichholz <ricotz@ubuntu.com>
Forwarded: no
Last-Update: 2014-10-29
---
diff --git a/js/src/configure b/js/src/configure
--- a/js/src/configure
+++ b/js/src/configure
@@ -1696,8 +1696,13 @@
MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'`
+if test -n "$JS_STANDALONE"; then
+JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION
+JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config
+else
JS_SHELL_NAME=js
JS_CONFIG_NAME=js-config
+fi
if test -n "$IS_ALPHA"; then
diff --git a/js/src/configure.in b/js/src/configure.in
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI
MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'`
-dnl XXX in a temporary bid to avoid developer anger at renaming files
-dnl XXX before "js" symlinks exist, don't change names.
-dnl
-dnl if test -n "$JS_STANDALONE"; then
-dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION
-dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config
-dnl else
+if test -n "$JS_STANDALONE"; then
+JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION
+JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config
+else
JS_SHELL_NAME=js
JS_CONFIG_NAME=js-config
-dnl fi
+fi
changequote([,])
if test -n "$IS_ALPHA"; then
diff -r 80a9e64d75f5 js/src/Makefile.in
--- a/js/src/Makefile.in Wed Jun 25 15:11:42 2014 +0200
+++ b/js/src/Makefile.in Sat Jul 05 14:08:38 2014 +0200
@@ -273,6 +273,9 @@
SCRIPTS = $(JS_CONFIG_NAME)
SDK_BINARY = $(JS_CONFIG_NAME)
+$(JS_CONFIG_NAME): js-config
+ cp $^ $@
+
$(LIBRARY_NAME).pc: js.pc
cp $^ $@

View file

@ -1,22 +0,0 @@
Add major version to pkg-config filename.
Author: Rico Tzschichholz <ricotz@ubuntu.com>
Forwarded: no
Last-Update: 2015-05-04
Index: b/js/src/Makefile.in
===================================================================
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -214,10 +214,10 @@
$(JS_CONFIG_NAME): js-config
cp $^ $@
-$(LIBRARY_NAME).pc: js.pc
+$(JS_LIBRARY_NAME).pc: js.pc
cp $^ $@
-install:: $(LIBRARY_NAME).pc
+install:: $(JS_LIBRARY_NAME).pc
$(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig
install:: js-config.h

View file

@ -1,47 +0,0 @@
# Template file for 'mozjs38'
pkgname=mozjs38
version=38.8.0
revision=6
wrksrc="mozilla-esr${version%.*.*}"
build_wrksrc="js/src"
build_style=gnu-configure
hostmakedepends="perl python pkg-config"
makedepends="icu-devel libffi-devel nspr-devel zlib-devel"
short_desc="Mozilla JavaScript interpreter and library (38.x series)"
homepage="http://www.mozilla.org/js/"
license="MPL-1.1, GPL-2, LGPL-2.1"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2"
checksum=9475adcee29d590383c4885bc5f958093791d1db4302d694a5d2766698f59982
patch_args="-Np1"
shlib_provides="libmozjs-38.so"
# Flags for gcc6.3 conceived by Arch Linux developers
CFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing"
CXXFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing"
# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
LDFLAGS="-fuse-ld=bfd"
do_configure() {
local _args
if [ "$CROSS_BUILD" ]; then
export HOST_CFLAGS="-Os"
export HOST_CXXFLAGS="-Os"
_args+=" --target=$XBPS_CROSS_TRIPLET"
fi
SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
--enable-threadsafe --enable-system-ffi --with-system-zlib \
--with-system-icu --with-system-nspr ${_args}
}
mozjs38-devel_package() {
depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/js38-config
vmove usr/include
vmove usr/lib/pkgconfig
}
}

View file

@ -1 +0,0 @@
pkgname="mozjs"

View file

@ -1,22 +1,21 @@
# Template file for 'muffin'
pkgname=muffin
version=3.6.0
version=3.8.2
revision=1
short_desc="Cinnamon window manager based on Mutter"
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
--enable-compile-warnings=minimum ac_cv_path_ZENITY=/usr/bin/zenity"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel intltool glib-devel gnome-doc-utils gtk-doc gdk-pixbuf-devel
gnome-doc-utils"
makedepends="clutter-devel startup-notification-devel libcanberra-devel
cinnamon-desktop-devel libXinerama-devel libSM-devel gnome-doc-utils"
depends="dconf zenity"
hostmakedepends="automake gdk-pixbuf-devel gettext-devel glib-devel
gnome-doc-utils gobject-introspection gtk-doc intltool pkg-config"
makedepends="cinnamon-desktop-devel clutter-devel gnome-doc-utils libSM-devel
libcanberra-devel startup-notification-devel"
depends="zenity"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=b343b6bf86d83dad01dcfb12d224c7eb2d4b63e1fbbe8beb3240a618ffecf737
checksum=b567c96022698f6fdc81118e5ffa5f14d4c95fd20c4ad228eee8c0d1b8cbc902
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

View file

@ -1,37 +1,36 @@
# Template file for 'nemo'
pkgname=nemo
version=3.6.5
version=3.8.3
revision=1
short_desc="The Cinnamon file manager (nautilus fork)"
build_style=gnu-configure
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
configure_args=" --disable-static --disable-update-mimedb
--disable-gtk-doc-html --disable-schemas-compile --disable-selinux"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel glib-devel intltool xmlto docbook-xml gtk-doc gir-freedesktop
python-polib python-gobject"
makedepends="libexif-devel gvfs-devel dconf-devel exempi-devel tracker-devel
cinnamon-desktop-devel libnotify-devel libxml2-devel xapps-devel"
depends="gvfs dconf cinnamon-translations desktop-file-utils hicolor-icon-theme"
hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection
intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
libexif-devel libnotify-devel tracker-devel xapps-devel"
depends="cinnamon-translations dconf gvfs"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=88df121685cb7bf0464a3ef41cf3734768903e832839cc4fe103c0b53ae187d5
checksum=6111819d07a4d482ef71a5659ce09db0502026c5fc9653d3577b58d57540f049
nocross="gobject-introspection"
build_options="gir"
if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gir"
fi
do_check() {
:
# requires a display
# Gtk-WARNING **: 18:34:08.533: cannot open display:
}
pre_configure() {
# Fix build
sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.ac
# Rename 'Files' app name to avoid having the same as nautilus
sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
NOCONFIGURE=1 ./autogen.sh
sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
}
libnemo_package() {

View file

@ -0,0 +1,19 @@
# Template file for 'python3-pam'
pkgname=python3-pam
version=1.8.3
revision=1
wrksrc="${pkgname/3}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel pam-devel"
depends="python3 pam"
short_desc="Python pam module supporting py3"
maintainer="John <johnz@posteo.net>"
license="MIT"
homepage="https://github.com/FirefighterBlu3/python-pam"
distfiles="https://github.com/FirefighterBlu3/python-pam/archive/v${version}.tar.gz"
checksum=a49efa94decf881fd0964e4bc257de824412694b7ffe3a68065d1ec0dd86bde3
post_install() {
vlicense LICENSE
}

View file

@ -1,7 +1,7 @@
# Template file for 'xapps'
pkgname=xapps
version=1.2.1
revision=1
revision=2
build_style=meson
hostmakedepends="glib-devel gnome-common pkg-config vala"
makedepends="gettext-devel gobject-introspection libgnomekbd-devel
@ -17,7 +17,8 @@ checksum=daf41acb021b4dfb1b313710eea812e315a9f49e6a2cc037691ec51799f4cf26
xapps-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
depends="${sourcepkg}>=${version}_${revision} libgnomekbd-devel libglib-devel
gdk-pixbuf-devel"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig