Merge branch '3.1' into 3.2
This commit is contained in:
commit
e26a7daa1e
@ -5,7 +5,7 @@
|
||||
|
||||
name=grub2
|
||||
version=2.00
|
||||
release=6
|
||||
release=7
|
||||
source=(ftp://ftp.gnu.org/gnu/grub/grub-$version.tar.xz \
|
||||
http://unifoundry.com/unifont-5.1.20080820.pcf.gz \
|
||||
$name-00_header.diff $name-10_linux.diff grub.cfg.sample)
|
||||
|
@ -173,49 +173,49 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/
|
||||
-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstxvimagesink.la
|
||||
-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstxvimagesink.so
|
||||
-rwxr-xr-x root/root usr/lib/libgstallocators-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstallocators-1.0.so -> libgstallocators-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstallocators-1.0.so.0 -> libgstallocators-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstallocators-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstallocators-1.0.so -> libgstallocators-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstallocators-1.0.so.0 -> libgstallocators-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstallocators-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstapp-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstapp-1.0.so -> libgstapp-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstapp-1.0.so.0 -> libgstapp-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstapp-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstapp-1.0.so -> libgstapp-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstapp-1.0.so.0 -> libgstapp-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstapp-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstaudio-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstaudio-1.0.so -> libgstaudio-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstaudio-1.0.so.0 -> libgstaudio-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstaudio-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstaudio-1.0.so -> libgstaudio-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstaudio-1.0.so.0 -> libgstaudio-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstaudio-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstfft-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstfft-1.0.so -> libgstfft-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstfft-1.0.so.0 -> libgstfft-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstfft-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstfft-1.0.so -> libgstfft-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstfft-1.0.so.0 -> libgstfft-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstfft-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstpbutils-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstpbutils-1.0.so -> libgstpbutils-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstpbutils-1.0.so.0 -> libgstpbutils-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstpbutils-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstpbutils-1.0.so -> libgstpbutils-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstpbutils-1.0.so.0 -> libgstpbutils-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstpbutils-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstriff-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstriff-1.0.so -> libgstriff-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstriff-1.0.so.0 -> libgstriff-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstriff-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstriff-1.0.so -> libgstriff-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstriff-1.0.so.0 -> libgstriff-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstriff-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstrtp-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstrtp-1.0.so -> libgstrtp-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstrtp-1.0.so.0 -> libgstrtp-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstrtp-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstrtp-1.0.so -> libgstrtp-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstrtp-1.0.so.0 -> libgstrtp-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstrtp-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstrtsp-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstrtsp-1.0.so -> libgstrtsp-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstrtsp-1.0.so.0 -> libgstrtsp-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstrtsp-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstrtsp-1.0.so -> libgstrtsp-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstrtsp-1.0.so.0 -> libgstrtsp-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstrtsp-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstsdp-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstsdp-1.0.so -> libgstsdp-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstsdp-1.0.so.0 -> libgstsdp-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstsdp-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstsdp-1.0.so -> libgstsdp-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstsdp-1.0.so.0 -> libgstsdp-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstsdp-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgsttag-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgsttag-1.0.so -> libgsttag-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgsttag-1.0.so.0 -> libgsttag-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgsttag-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgsttag-1.0.so -> libgsttag-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgsttag-1.0.so.0 -> libgsttag-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgsttag-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstvideo-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstvideo-1.0.so -> libgstvideo-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstvideo-1.0.so.0 -> libgstvideo-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstvideo-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstvideo-1.0.so -> libgstvideo-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstvideo-1.0.so.0 -> libgstvideo-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstvideo-1.0.so.0.601.0
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-allocators-1.0.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-app-1.0.pc
|
||||
|
@ -1 +1 @@
|
||||
3c223f1d2716e1861ba84287ea02b164 gst-plugins-base-1.6.0.tar.xz
|
||||
a89933afbe45d8f8c92d89c2f1199ecb gst-plugins-base-1.6.1.tar.xz
|
||||
|
@ -6,7 +6,7 @@
|
||||
# Optional: cdparanoia libtheora libvisual orc
|
||||
|
||||
name=gst-plugins-base
|
||||
version=1.6.0
|
||||
version=1.6.1
|
||||
release=1
|
||||
source=(http://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz)
|
||||
|
||||
|
@ -131,25 +131,25 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/include/gst/
|
||||
-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstcoreelements.la
|
||||
-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstcoreelements.so
|
||||
-rwxr-xr-x root/root usr/lib/libgstbase-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstbase-1.0.so -> libgstbase-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstbase-1.0.so.0 -> libgstbase-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstbase-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstbase-1.0.so -> libgstbase-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstbase-1.0.so.0 -> libgstbase-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstbase-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstcheck-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstcheck-1.0.so -> libgstcheck-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstcheck-1.0.so.0 -> libgstcheck-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstcheck-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstcheck-1.0.so -> libgstcheck-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstcheck-1.0.so.0 -> libgstcheck-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstcheck-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstcontroller-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstcontroller-1.0.so -> libgstcontroller-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstcontroller-1.0.so.0 -> libgstcontroller-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstcontroller-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstcontroller-1.0.so -> libgstcontroller-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstcontroller-1.0.so.0 -> libgstcontroller-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstcontroller-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstnet-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstnet-1.0.so -> libgstnet-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstnet-1.0.so.0 -> libgstnet-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstnet-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstnet-1.0.so -> libgstnet-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstnet-1.0.so.0 -> libgstnet-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstnet-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstreamer-1.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgstreamer-1.0.so -> libgstreamer-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstreamer-1.0.so.0 -> libgstreamer-1.0.so.0.600.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstreamer-1.0.so.0.600.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstreamer-1.0.so -> libgstreamer-1.0.so.0.601.0
|
||||
lrwxrwxrwx root/root usr/lib/libgstreamer-1.0.so.0 -> libgstreamer-1.0.so.0.601.0
|
||||
-rwxr-xr-x root/root usr/lib/libgstreamer-1.0.so.0.601.0
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-1.0.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-base-1.0.pc
|
||||
|
@ -1 +1 @@
|
||||
201c15ac4b956833f7f6774485433969 gstreamer-1.6.0.tar.xz
|
||||
e72e2dc2ee06bfc045bb6010c89de520 gstreamer-1.6.1.tar.xz
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: gobject-introspection libxml2
|
||||
|
||||
name=gstreamer
|
||||
version=1.6.0
|
||||
version=1.6.1
|
||||
release=1
|
||||
source=(http://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz)
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
c5ccf58f5f9f57aba75c8b72219eb6e6 exports
|
||||
167ea3a16eb6f33b3642e920147bb265 idmapd.conf
|
||||
49054b601b8277e86cafae36911cba46 nfs
|
||||
1e2f3c1ed468dee02d00c534c002ea10 nfs-utils-1.3.2.tar.bz2
|
||||
9b87d890669eaaec8e97a2b0a35b2665 nfs-utils-1.3.3.tar.bz2
|
||||
6981419f23fbe0a0ef3b44eb2efac8fd nfsclient
|
||||
eb907aa29567365aef517b7948dc9aa0 nfsserver
|
||||
53712b894699394dbfb303171b649c5a nfssvc_setfds.patch
|
||||
dfe1c59368b5846316ebcf3b32666c54 rpc.idmapd
|
||||
ae09bd1df5f97d36b551c067d0f9261a rpc.mountd
|
||||
d5f41aee9b491bf23d7986e4445dbc92 rpc.nfsd
|
||||
21d75587a1538b325bc9be0ecd9426a5 rpc.statd
|
||||
b4c745cd305c718157af2f24eef21525 statd_foreground_mode.patch
|
||||
|
@ -4,17 +4,18 @@
|
||||
# Depends on: util-linux eudev libcap rpcbind libnfsidmap libevent keyutils sqlite3
|
||||
|
||||
name=nfs-utils
|
||||
version=1.3.2
|
||||
release=5
|
||||
version=1.3.3
|
||||
release=1
|
||||
source=(http://downloads.sourceforge.net/project/nfs/$name/$version/$name-$version.tar.bz2
|
||||
exports idmapd.conf
|
||||
nfs nfsclient nfsserver rpc.idmapd rpc.statd rpc.mountd rpc.nfsd
|
||||
statd_foreground_mode.patch)
|
||||
nfssvc_setfds.patch)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 -i $SRC/statd_foreground_mode.patch
|
||||
# http://thread.gmane.org/gmane.linux.nfs/72767
|
||||
patch -p1 -i $SRC/nfssvc_setfds.patch
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
|
57
nfs-utils/nfssvc_setfds.patch
Normal file
57
nfs-utils/nfssvc_setfds.patch
Normal file
@ -0,0 +1,57 @@
|
||||
On Mon, Aug 17, 2015 at 08:40:25AM -0700, Chuck Lever wrote:
|
||||
> Probably stopped working with "rpc.nfsd: Squelch DNS errors when
|
||||
> using --host option".
|
||||
>
|
||||
> getaddrinfo(3) returns a list of addresses, some of which are
|
||||
> IPv6 addresses. It gets the list from /etc/hosts, or DNS. Even
|
||||
> on kernels which do not support IPv6, there may be at least one
|
||||
> IPv6 address in the list.
|
||||
>
|
||||
> nfssvc_setfds() then loops over this list. The error handling
|
||||
> in nfssvc_setfds() causes the loop to exit if the socket(2)
|
||||
> call fails. It should "continue" if the error is EAFNOSUPPORT.
|
||||
> In fact, that xlog notice can also be removed.
|
||||
>
|
||||
> I'm traveling this week. Is this enough for you to generate a
|
||||
> fix?
|
||||
|
||||
Yes, that works:
|
||||
|
||||
---
|
||||
From: Christoph Hellwig <hch@lst.de>
|
||||
Subject: nfsd: ignore unsupported address types in nfssvc_setfds
|
||||
|
||||
Just continue and try a different record returned from getaddrinfo
|
||||
if the kernel does not support an address family. This fixes nfsd
|
||||
startup on kernels without IPv6 support.
|
||||
|
||||
Suggested-by: Chuck Lever <chuck.lever@oracle.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
|
||||
diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
|
||||
index a2b11d8..fc11d23 100644
|
||||
--- a/utils/nfsd/nfssvc.c
|
||||
+++ b/utils/nfsd/nfssvc.c
|
||||
@@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
|
||||
sockfd = socket(addr->ai_family, addr->ai_socktype,
|
||||
addr->ai_protocol);
|
||||
if (sockfd < 0) {
|
||||
- if (errno == EAFNOSUPPORT)
|
||||
- xlog(L_NOTICE, "address family %s not "
|
||||
- "supported by protocol %s",
|
||||
- family, proto);
|
||||
- else
|
||||
+ if (errno != EAFNOSUPPORT) {
|
||||
xlog(L_ERROR, "unable to create %s %s socket: "
|
||||
"errno %d (%m)", family, proto, errno);
|
||||
- rc = errno;
|
||||
- goto error;
|
||||
+ rc = errno;
|
||||
+ goto error;
|
||||
+ }
|
||||
+ addr = addr->ai_next;
|
||||
+ continue;
|
||||
}
|
||||
#ifdef IPV6_SUPPORTED
|
||||
if (addr->ai_family == AF_INET6 &&
|
||||
--
|
@ -1,27 +0,0 @@
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1188052
|
||||
|
||||
commit 17a3e5bffb7110d46de1bf42b64b90713ff5ea50
|
||||
Author: Chris Mayo <aklhfex@gmail.com>
|
||||
Date: Sun Feb 1 12:03:46 2015 -0500
|
||||
|
||||
statd: Fix test for foreground mode
|
||||
|
||||
daemon_init parameter has the opposite sense
|
||||
to code removed in commit 7addf9d
|
||||
|
||||
Signed-off-by: Chris Mayo <aklhfex@gmail.com>
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
|
||||
diff --git a/utils/statd/statd.c b/utils/statd/statd.c
|
||||
index 60ce6d1..2b7a167 100644
|
||||
--- a/utils/statd/statd.c
|
||||
+++ b/utils/statd/statd.c
|
||||
@@ -393,7 +393,7 @@ int main (int argc, char **argv)
|
||||
simulator (--argc, ++argv); /* simulator() does exit() */
|
||||
#endif
|
||||
|
||||
- daemon_init(!(run_mode & MODE_NODAEMON));
|
||||
+ daemon_init((run_mode & MODE_NODAEMON));
|
||||
|
||||
if (run_mode & MODE_LOG_STDERR) {
|
||||
xlog_syslog(0);
|
5839
qt5/.footprint
5839
qt5/.footprint
File diff suppressed because it is too large
Load Diff
@ -1,4 +1 @@
|
||||
cab3284d52ea700b8761f4d71d68baf0 avoid-calling-potentially-pure-virtual-method.patch
|
||||
39e285d08b4951de095c2f6d6acdc925 ibus-get-display-number-when-screen-number-is-omitted.patch
|
||||
665439088fc7de52a97455c5eaf87889 keypad-shortcuts.patch
|
||||
c23bd0f14d66e7901d24906a1edce9b0 qt-everywhere-opensource-src-5.4.2.tar.xz
|
||||
c2a249e8795d45200d997d96860d0353 qt-everywhere-opensource-src-5.5.1.tar.xz
|
||||
|
16
qt5/Pkgfile
16
qt5/Pkgfile
@ -5,25 +5,13 @@
|
||||
# Depends on: dbus gst-plugins-base gst-plugins-base-compat libmng mesa3d xorg-libxcursor xorg-libxi xorg-libxinerama xorg-libxrandr xorg-xcb-util-image xorg-xcb-util-wm xorg-xcb-util-keysyms
|
||||
|
||||
name=qt5
|
||||
version=5.4.2
|
||||
version=5.5.1
|
||||
release=1
|
||||
source=(http://download.qt.io/official_releases/qt/${version%.*}/$version/single/qt-everywhere-opensource-src-$version.tar.xz
|
||||
keypad-shortcuts.patch
|
||||
avoid-calling-potentially-pure-virtual-method.patch
|
||||
ibus-get-display-number-when-screen-number-is-omitted.patch)
|
||||
source=(http://download.qt.io/official_releases/qt/${version%.*}/$version/single/qt-everywhere-opensource-src-$version.tar.xz)
|
||||
|
||||
build() {
|
||||
cd qt-everywhere-opensource-src-$version
|
||||
|
||||
# https://bugs.archlinux.org/task/44676
|
||||
patch -d qtbase -p1 -i $SRC/keypad-shortcuts.patch
|
||||
|
||||
# https://bugs.archlinux.org/task/43986
|
||||
patch -d qtdeclarative -p1 -i $SRC/avoid-calling-potentially-pure-virtual-method.patch
|
||||
|
||||
# https://bugs.archlinux.org/task/45180
|
||||
patch -d qtbase -p1 -i $SRC/ibus-get-display-number-when-screen-number-is-omitted.patch
|
||||
|
||||
# Respect system CXX
|
||||
[ "$CXX" ] || CXX=g++
|
||||
sed -i "/^QMAKE_CXX\s/s|=.*|= $CXX|" qtbase/mkspecs/common/g++-base.conf
|
||||
|
@ -1,64 +0,0 @@
|
||||
From 0d31aa1617c96ed3e3624d77332ea6f13aba1492 Mon Sep 17 00:00:00 2001
|
||||
From: David Edmundson <davidedmundson@kde.org>
|
||||
Date: Thu, 23 Apr 2015 15:01:24 +0200
|
||||
Subject: [PATCH 67/68] Avoid calling potentially pure virtual method
|
||||
|
||||
In Qt 5.4 screenChanged is called indirectly from the destructor of
|
||||
QPlatformScreen. By comparing new values against the oldScreen we call
|
||||
call virtual methods of QPlatformScreen from it's own destructor which
|
||||
results in a crash.
|
||||
|
||||
This patch simply emits change signals whenever a screen change regardless
|
||||
of whether the value differs from the previous screen. Arguably less
|
||||
efficient, but better than crashing.
|
||||
|
||||
This fix is not needed in Qt 5.5 where the QPA architecture has changed.
|
||||
|
||||
Task-number: QTBUG-45753
|
||||
Change-Id: Ic155906928855a377add9b21bff9e72b31f4667e
|
||||
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
||||
---
|
||||
src/quick/items/qquickscreen.cpp | 27 +++++++++------------------
|
||||
1 file changed, 9 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
|
||||
index c4d1407..0900adb 100644
|
||||
--- a/src/quick/items/qquickscreen.cpp
|
||||
+++ b/src/quick/items/qquickscreen.cpp
|
||||
@@ -347,24 +347,15 @@ void QQuickScreenAttached::screenChanged(QScreen *screen)
|
||||
emit orientationUpdateMaskChanged();
|
||||
}
|
||||
|
||||
- if (!oldScreen || screen->size() != oldScreen->size()) {
|
||||
- emit widthChanged();
|
||||
- emit heightChanged();
|
||||
- }
|
||||
- if (!oldScreen || screen->name() != oldScreen->name())
|
||||
- emit nameChanged();
|
||||
- if (!oldScreen || screen->orientation() != oldScreen->orientation())
|
||||
- emit orientationChanged();
|
||||
- if (!oldScreen || screen->primaryOrientation() != oldScreen->primaryOrientation())
|
||||
- emit primaryOrientationChanged();
|
||||
- if (!oldScreen || screen->availableVirtualGeometry() != oldScreen->availableVirtualGeometry())
|
||||
- emit desktopGeometryChanged();
|
||||
- if (!oldScreen || screen->logicalDotsPerInch() != oldScreen->logicalDotsPerInch())
|
||||
- emit logicalPixelDensityChanged();
|
||||
- if (!oldScreen || screen->physicalDotsPerInch() != oldScreen->physicalDotsPerInch())
|
||||
- emit pixelDensityChanged();
|
||||
- if (!oldScreen || screen->devicePixelRatio() != oldScreen->devicePixelRatio())
|
||||
- emit devicePixelRatioChanged();
|
||||
+ emit widthChanged();
|
||||
+ emit heightChanged();
|
||||
+ emit nameChanged();
|
||||
+ emit orientationChanged();
|
||||
+ emit primaryOrientationChanged();
|
||||
+ emit desktopGeometryChanged();
|
||||
+ emit logicalPixelDensityChanged();
|
||||
+ emit pixelDensityChanged();
|
||||
+ emit devicePixelRatioChanged();
|
||||
|
||||
connect(screen, SIGNAL(geometryChanged(QRect)),
|
||||
this, SIGNAL(widthChanged()));
|
||||
--
|
||||
2.3.7
|
||||
|
@ -1,32 +0,0 @@
|
||||
From c72325d52575cb8a46cc8595c592c27581089dec Mon Sep 17 00:00:00 2001
|
||||
From: Takao Fujiwara <tfujiwar@redhat.com>
|
||||
Date: Tue, 24 Mar 2015 19:08:34 +0900
|
||||
Subject: [PATCH] ibus: Get display number when screen number is omitted.
|
||||
|
||||
QIBusPlatformInputContextPrivate::createConnection() parses DISPLAY
|
||||
variable and it does not get the display number when the screen number
|
||||
is omitted. E.g. DISPLAY=":1".
|
||||
|
||||
Change-Id: I9f81d8114d4e0f654a27ada67c5dc110eb34cd64
|
||||
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
|
||||
---
|
||||
.../ibus/qibusplatforminputcontext.cpp | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
|
||||
index d00435b..673942b 100644
|
||||
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
|
||||
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
|
||||
@@ -351,6 +351,8 @@ QDBusConnection *QIBusPlatformInputContextPrivate::createConnection()
|
||||
int pos2 = display.indexOf('.', pos);
|
||||
if (pos2 > 0)
|
||||
displayNumber = display.mid(pos, pos2 - pos);
|
||||
+ else
|
||||
+ displayNumber = display.right(pos);
|
||||
if (debug)
|
||||
qDebug() << "host=" << host << "displayNumber" << displayNumber;
|
||||
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
@ -1,94 +0,0 @@
|
||||
From c137502c7fd7550c780c9531ec414098d8101757 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Volkov <a.volkov@rusbitech.ru>
|
||||
Date: Thu, 18 Sep 2014 16:16:26 +0400
|
||||
Subject: Fix shortcuts with keypad keys
|
||||
|
||||
The way of searching a shortcut match for a key without the keypad
|
||||
modifier introduced in 547a1bea492954d828aa0798be93384669812489 is
|
||||
not correct. QKeyEvent::setModifiers() doesn't change native scan code
|
||||
so we get the incorrect QKeyEvent object which is eventually passed to
|
||||
the implementation of QPlatformIntegration::possibleKeys().
|
||||
And then QPlatformIntegration::possibleKeys() returns the same result
|
||||
as for the original QKeyEvent object.
|
||||
|
||||
So to fix it we have to remove Qt::KeypadModifier from keys after
|
||||
calling the implementation of QPlatformIntegration::possibleKeys(),
|
||||
as it was before 547a1bea492954d828aa0798be93384669812489.
|
||||
|
||||
Task-number: QTBUG-33093
|
||||
Task-number: QTBUG-20191
|
||||
Change-Id: I5b33c9b6cf2c06b133166a31eba9aff9181c9483
|
||||
---
|
||||
src/gui/kernel/qshortcutmap.cpp | 12 +++++-------
|
||||
src/gui/kernel/qshortcutmap_p.h | 4 ++--
|
||||
2 files changed, 7 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
|
||||
index c915ed39..c13c82c 100644
|
||||
--- a/src/gui/kernel/qshortcutmap.cpp
|
||||
+++ b/src/gui/kernel/qshortcutmap.cpp
|
||||
@@ -388,9 +388,7 @@ QKeySequence::SequenceMatch QShortcutMap::nextState(QKeyEvent *e)
|
||||
result = find(e);
|
||||
if (result == QKeySequence::NoMatch && (e->modifiers() & Qt::KeypadModifier)) {
|
||||
// Try to find a match without keypad modifier
|
||||
- QKeyEvent event = *e;
|
||||
- event.setModifiers(e->modifiers() & ~Qt::KeypadModifier);
|
||||
- result = find(&event);
|
||||
+ result = find(e, Qt::KeypadModifier);
|
||||
}
|
||||
if (result == QKeySequence::NoMatch && e->modifiers() & Qt::ShiftModifier) {
|
||||
// If Shift + Key_Backtab, also try Shift + Qt::Key_Tab
|
||||
@@ -443,13 +441,13 @@ bool QShortcutMap::hasShortcutForKeySequence(const QKeySequence &seq) const
|
||||
which can be access through matches().
|
||||
\sa matches
|
||||
*/
|
||||
-QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e)
|
||||
+QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e, int ignoredModifiers)
|
||||
{
|
||||
Q_D(QShortcutMap);
|
||||
if (!d->sequences.count())
|
||||
return QKeySequence::NoMatch;
|
||||
|
||||
- createNewSequences(e, d->newEntries);
|
||||
+ createNewSequences(e, d->newEntries, ignoredModifiers);
|
||||
#if defined(DEBUG_QSHORTCUTMAP)
|
||||
qDebug() << "Possible shortcut key sequences:" << d->newEntries;
|
||||
#endif
|
||||
@@ -551,7 +549,7 @@ void QShortcutMap::clearSequence(QVector<QKeySequence> &ksl)
|
||||
Alters \a seq to the new sequence state, based on the
|
||||
current sequence state, and the new key event \a e.
|
||||
*/
|
||||
-void QShortcutMap::createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl)
|
||||
+void QShortcutMap::createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl, int ignoredModifiers)
|
||||
{
|
||||
Q_D(QShortcutMap);
|
||||
QList<int> possibleKeys = QKeyMapper::possibleKeys(e);
|
||||
@@ -581,7 +579,7 @@ void QShortcutMap::createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl)
|
||||
curKsl.setKey(0, 2);
|
||||
curKsl.setKey(0, 3);
|
||||
}
|
||||
- curKsl.setKey(possibleKeys.at(pkNum), index);
|
||||
+ curKsl.setKey(possibleKeys.at(pkNum) & ~ignoredModifiers, index);
|
||||
}
|
||||
}
|
||||
}
|
||||
diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h
|
||||
index 3959c2c..39a8eac 100644
|
||||
--- a/src/gui/kernel/qshortcutmap_p.h
|
||||
+++ b/src/gui/kernel/qshortcutmap_p.h
|
||||
@@ -96,10 +96,10 @@ private:
|
||||
QKeySequence::SequenceMatch state();
|
||||
void dispatchEvent(QKeyEvent *e);
|
||||
|
||||
- QKeySequence::SequenceMatch find(QKeyEvent *e);
|
||||
+ QKeySequence::SequenceMatch find(QKeyEvent *e, int ignoredModifiers = 0);
|
||||
QKeySequence::SequenceMatch matches(const QKeySequence &seq1, const QKeySequence &seq2) const;
|
||||
QVector<const QShortcutEntry *> matches() const;
|
||||
- void createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl);
|
||||
+ void createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl, int ignoredModifiers);
|
||||
void clearSequence(QVector<QKeySequence> &ksl);
|
||||
int translateModifiers(Qt::KeyboardModifiers modifiers);
|
||||
|
||||
--
|
||||
cgit v0.11.0
|
||||
|
@ -591,6 +591,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
|
||||
-rw-r--r-- root/root usr/include/wine/windows/pktdef.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/poppack.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/powrprof.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/prntvpt.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/profinfo.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/propidl.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/propidl.idl
|
||||
@ -833,6 +834,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
|
||||
-rw-r--r-- root/root usr/include/wine/windows/x3daudio.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/xapo.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/xapo.idl
|
||||
-rw-r--r-- root/root usr/include/wine/windows/xapofx.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/xaudio2.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/xaudio2.idl
|
||||
-rw-r--r-- root/root usr/include/wine/windows/xaudio2fx.h
|
||||
@ -1627,6 +1629,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/vcomp110.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/vcomp120.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/vcomp90.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/vcruntime140.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/vdmdbg.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/version.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/view.exe
|
||||
@ -1638,6 +1641,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/wevtapi.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/wevtutil.exe
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/wiaservc.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/wimgapi.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/windowscodecs.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/windowscodecsext.dll
|
||||
-rw-r--r-- root/root usr/lib/wine/fakedlls/winealsa.drv
|
||||
@ -1945,7 +1949,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
|
||||
-rw-r--r-- root/root usr/lib/wine/libwsnmp32.def
|
||||
-rw-r--r-- root/root usr/lib/wine/libwsock32.def
|
||||
-rw-r--r-- root/root usr/lib/wine/libwtsapi32.def
|
||||
-rw-r--r-- root/root usr/lib/wine/libx3daudio1_7.def
|
||||
-rw-r--r-- root/root usr/lib/wine/libxaudio2_8.def
|
||||
-rw-r--r-- root/root usr/lib/wine/libxinput.def
|
||||
-rw-r--r-- root/root usr/lib/wine/libxmllite.def
|
||||
-rwxr-xr-x root/root usr/lib/wine/loadperf.dll.so
|
||||
@ -2176,6 +2180,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
|
||||
-rwxr-xr-x root/root usr/lib/wine/vcomp110.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/vcomp120.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/vcomp90.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/vcruntime140.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/vdmdbg.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/version.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/view.exe.so
|
||||
@ -2187,6 +2192,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
|
||||
-rwxr-xr-x root/root usr/lib/wine/wevtapi.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/wevtutil.exe.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/wiaservc.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/wimgapi.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/windowscodecs.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/windowscodecsext.dll.so
|
||||
-rwxr-xr-x root/root usr/lib/wine/winealsa.drv.so
|
||||
@ -3098,6 +3104,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vcomp110.dll
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vcomp120.dll
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vcomp90.dll
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vcruntime140.dll
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vdhcp.vxd
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vdmdbg.dll
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/ver.dll16
|
||||
@ -3118,6 +3125,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wevtapi.dll
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wevtutil.exe
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wiaservc.dll
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wimgapi.dll
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/win32s16.dll16
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/win87em.dll16
|
||||
-rw-r--r-- root/root usr/lib32/wine/fakedlls/winaspi.dll16
|
||||
@ -3445,7 +3453,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
|
||||
-rw-r--r-- root/root usr/lib32/wine/libwsnmp32.def
|
||||
-rw-r--r-- root/root usr/lib32/wine/libwsock32.def
|
||||
-rw-r--r-- root/root usr/lib32/wine/libwtsapi32.def
|
||||
-rw-r--r-- root/root usr/lib32/wine/libx3daudio1_7.def
|
||||
-rw-r--r-- root/root usr/lib32/wine/libxaudio2_8.def
|
||||
-rw-r--r-- root/root usr/lib32/wine/libxinput.def
|
||||
-rw-r--r-- root/root usr/lib32/wine/libxmllite.def
|
||||
-rwxr-xr-x root/root usr/lib32/wine/loadperf.dll.so
|
||||
@ -3703,6 +3711,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
|
||||
-rwxr-xr-x root/root usr/lib32/wine/vcomp110.dll.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/vcomp120.dll.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/vcomp90.dll.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/vcruntime140.dll.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/vdhcp.vxd.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/vdmdbg.dll.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/ver.dll16.so
|
||||
@ -3723,6 +3732,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
|
||||
-rwxr-xr-x root/root usr/lib32/wine/wevtapi.dll.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/wevtutil.exe.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/wiaservc.dll.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/wimgapi.dll.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/win32s16.dll16.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/win87em.dll16.so
|
||||
-rwxr-xr-x root/root usr/lib32/wine/winaspi.dll16.so
|
||||
|
@ -1,4 +1,4 @@
|
||||
199c4adc4f294bdbec51f919b34a3798 wine-1.7.53.tar.bz2
|
||||
155bbbed0465e8d56d5e6cb14a51fb6e wine-1.7.54.tar.bz2
|
||||
6cec03fb81eb083c517c9bb2d70a1424 wine-mono-4.5.6.msi
|
||||
66fa7ceca8c0aa84c6a2db8672a743b6 wine_gecko-2.40-x86.msi
|
||||
5e5d242e52e885190a0fe02a2e38a987 wine_gecko-2.40-x86_64.msi
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-turbo-32 prelink gnutls-32
|
||||
|
||||
name=wine
|
||||
version=1.7.53
|
||||
version=1.7.54
|
||||
release=1
|
||||
source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2
|
||||
http://downloads.sourceforge.net/wine/wine_gecko-2.40-x86.msi
|
||||
|
Loading…
x
Reference in New Issue
Block a user