[telegram-desktop/el7] Updated to version 1.1.9.
by Vitaly Zaitsev
commit cace415dbcd6897e4863a236a2d87488561e56f7
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Jun 30 23:57:53 2017 +0500
Updated to version 1.1.9.
.gitignore | 1 +
0001-Fix-crash-in-video-player-seeking.patch | 77 ---------------------------
add_russian_locale.patch | 69 ------------------------
fix_build_under_fedora.patch | 28 +++++-----
sources | 3 +-
tdesktop-1.1.7-russian.strings | Bin 132550 -> 0 bytes
telegram-desktop.spec | 41 ++++----------
7 files changed, 28 insertions(+), 191 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17d8fb3..daa1d90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/tdesktop-1.1.2.tar.gz
/libtgvoip-2993da5.tar.gz
/tdesktop-1.1.7.tar.gz
+/tdesktop-1.1.9.tar.gz
diff --git a/fix_build_under_fedora.patch b/fix_build_under_fedora.patch
index 5e50c3e..ed766c4 100644
--- a/fix_build_under_fedora.patch
+++ b/fix_build_under_fedora.patch
@@ -1,4 +1,4 @@
-From 8c1ea2225422a80f9f4c9f64ba4977e36052c4f1 Mon Sep 17 00:00:00 2001
+From 337972b43b01c29248229015d86c672dac0c4f5d Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
@@ -6,7 +6,7 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
---
Telegram/SourceFiles/main.cpp | 7 ++-
Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++++++++
- Telegram/SourceFiles/qt_static_plugins.cpp | 8 ---
+ Telegram/SourceFiles/qt_static_plugins.cpp | 9 ---
Telegram/SourceFiles/ui/text/text.cpp | 6 +-
Telegram/SourceFiles/ui/text/text_block.cpp | 2 +-
Telegram/SourceFiles/ui/twidget.cpp | 4 +-
@@ -15,12 +15,12 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
Telegram/gyp/qt.gypi | 80 +++++++-----------------
Telegram/gyp/qt_rcc.gypi | 2 +-
Telegram/gyp/settings_linux.gypi | 8 +--
- Telegram/gyp/telegram_linux.gypi | 57 +++++------------
+ Telegram/gyp/telegram_linux.gypi | 58 +++++-------------
Telegram/gyp/telegram_sources.txt | 8 +--
Telegram/gyp/utils.gyp | 4 +-
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 6 +-
- 16 files changed, 159 insertions(+), 151 deletions(-)
+ 16 files changed, 159 insertions(+), 153 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
@@ -150,10 +150,10 @@ index 0000000..4a722b8
+ flags |= QTextItem::StrikeOut;
+}
diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
-index 1d4896a..f2f876b 100644
+index b975c7a..f2f876b 100644
--- a/Telegram/SourceFiles/qt_static_plugins.cpp
+++ b/Telegram/SourceFiles/qt_static_plugins.cpp
-@@ -28,12 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
+@@ -28,13 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
#elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC
@@ -165,9 +165,10 @@ index 1d4896a..f2f876b 100644
-Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
-Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
-Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
+-Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
-index dbc2b0d..61fa93c 100644
+index 044f871..0865a5b 100644
--- a/Telegram/SourceFiles/ui/text/text.cpp
+++ b/Telegram/SourceFiles/ui/text/text.cpp
@@ -1692,11 +1692,11 @@ private:
@@ -199,10 +200,10 @@ index f89644e..35230cf 100644
layout.createLine();
diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index 04fad32..688cd8e 100644
+index e9848ef..dcee47e 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
-@@ -187,9 +187,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
+@@ -191,9 +191,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
, button
, QGuiApplication::mouseButtons() | button
, QGuiApplication::keyboardModifiers()
@@ -484,10 +485,10 @@ index fde88dc..7d60322 100644
'Debug': {
},
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index b8866ec..1b14723 100644
+index 2c46492..1b14723 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -27,72 +27,43 @@
+@@ -27,73 +27,43 @@
# QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create
#'xkbcommon',
],
@@ -525,6 +526,7 @@ index b8866ec..1b14723 100644
- 'composeplatforminputcontextplugin',
- 'ibusplatforminputcontextplugin',
- 'fcitxplatforminputcontextplugin',
+- 'himeplatforminputcontextplugin',
- 'liblzma.a',
- 'libopenal.a',
- 'libavformat.a',
@@ -575,10 +577,10 @@ index b8866ec..1b14723 100644
},
},
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 069aa30..ce27332 100644
+index bfc18fd..4a1c525 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -555,13 +555,7 @@
+@@ -579,13 +579,7 @@
<(src_loc)/structs.h
platforms: !win
diff --git a/sources b/sources
index e40ad56..18aad6d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
ba90e749953f2ac1c013011601a58598 GSL-c5851a8.tar.gz
0373c28165f86474f8abdce278320c1a gyp-a478c1a.tar.gz
38d0bd37a328d04a4c8f723691f0901e libtgvoip-2993da5.tar.gz
-3a4675445f1f5022e0509375a6698ddc tdesktop-1.1.7.tar.gz
-dac56e1dcadfad1b7370d10cbc405fc7 variant-550ac2f.tar.gz
+86b18dc4313f4506bcfff16ed26d016b tdesktop-1.1.9.tar.gz
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index bcdcbd4..32b25e4 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -10,26 +10,20 @@
%global commit2 c5851a8161938798c5594a66420cb814fea92711
%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
-# Git revision of Variant...
-%global commit3 550ac2f159ca883d360c196149b466955c77a573
-%global shortcommit3 %(c=%{commit3}; echo ${c:0:7})
-
# Git revision of libtgvoip...
-%global commit4 2993da5aa08d18b549cc6fff160fc732f4114a31
-%global shortcommit4 %(c=%{commit4}; echo ${c:0:7})
+%global commit3 2993da5aa08d18b549cc6fff160fc732f4114a31
+%global shortcommit3 %(c=%{commit3}; echo ${c:0:7})
Summary: Telegram is a new era of messaging
Name: telegram-desktop
-Version: 1.1.7
+Version: 1.1.9
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
# * S1 (GYP) - BSD -- build-time dependency;
# * S2 (GSL) - MIT -- build-time dependency;
-# * S3 (Variant) - BSD -- build-time dependency;
-# * S4 (libtgvoip) - Public Domain -- shared library;
-# * S5 (Russian language pack) - GPLv3+ -- bundled into executable.
+# * S3 (libtgvoip) - Public Domain -- shared library;
# * P0 (qt_functions.cpp) - LGPLv3 -- build-time dependency.
License: GPLv3+ and LGPLv3 and BSD and MIT
Group: Applications/Internet
@@ -39,15 +33,10 @@ ExclusiveArch: i686 x86_64
Source0: %{url}/archive/v%{version}.tar.gz#/%{appname}-%{version}.tar.gz
Source1: https://chromium.googlesource.com/external/gyp/+archive/%{commit1}.tar.gz...
Source2: https://github.com/Microsoft/GSL/archive/%{commit2}.tar.gz#/GSL-%{shortco...
-Source3: https://github.com/mapbox/variant/archive/%{commit3}.tar.gz#/variant-%{sh...
-Source4: https://github.com/telegramdesktop/libtgvoip/archive/%{commit4}.tar.gz#/l...
-Source5: https://tlgrm.ru/files/locales/tdesktop/Russian.strings#/%{appname}-%{ver...
+Source3: https://github.com/telegramdesktop/libtgvoip/archive/%{commit3}.tar.gz#/l...
Patch0: fix_build_under_fedora.patch
Patch1: fix_libtgvoip.patch
-Patch2: add_russian_locale.patch
-
-Patch101: 0001-Fix-crash-in-video-player-seeking.patch
Provides: libtgvoip = %{voipver}
Requires: hicolor-icon-theme
@@ -98,6 +87,7 @@ BuildRequires: libxkbcommon-x11-devel
BuildRequires: harfbuzz-devel
BuildRequires: gtk3-devel
BuildRequires: pulseaudio-libs-devel
+BuildRequires: mapbox-variant-devel
%if 0%{?fedora} >= 26
BuildRequires: compat-openssl10-devel
%else
@@ -120,8 +110,6 @@ personal or business messaging needs.
# Unpacking Telegram Desktop source archive...
%setup -qn %{appname}-%{version}
%patch0 -p1
-%patch2 -p1
-%patch101 -p1
# Unpacking GYP...
mkdir -p Telegram/ThirdParty/gyp
@@ -137,18 +125,11 @@ pushd Telegram/ThirdParty
mv GSL-%{commit2} GSL
popd
-# Unpacking Variant...
-pushd Telegram/ThirdParty
- rm -rf variant
- tar -xf %{SOURCE3}
- mv variant-%{commit3} variant
-popd
-
# Unpacking libtgvoip...
pushd Telegram/ThirdParty
rm -rf libtgvoip
- tar -xf %{SOURCE4}
- mv libtgvoip-%{commit4} libtgvoip
+ tar -xf %{SOURCE3}
+ mv libtgvoip-%{commit3} libtgvoip
popd
# Patching libtgvoip...
@@ -156,9 +137,6 @@ pushd Telegram/ThirdParty/libtgvoip
%patch1 -p1
popd
-# Unpacking additional locales from sources...
-iconv -f "UTF-16" -t "UTF-8" "%{SOURCE5}" > Telegram/Resources/langs/lang_ru.strings
-
%build
# Exporting some additional constants...
export VOIPVER="%{voipver}"
@@ -248,6 +226,9 @@ fi
%{_datadir}/appdata/%{name}.appdata.xml
%changelog
+* Fri Jun 30 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.9-1
+- Updated to 1.1.9.
+
* Wed May 31 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.1.7-1
- Updated to 1.1.7.
7 years
[VirtualBox-kmod] Add patch for kernel 4.12
by Sérgio M. Basto
commit 776f4611e4bf7d93f46be3aef10fac890e45d975
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Jun 30 15:53:03 2017 +0100
Add patch for kernel 4.12
VirtualBox-kmod.spec | 7 +-
vbox_fix_for_kernel_4.12_rf.patch | 262 ++++++++++++++++++++++++++++++++++++++
2 files changed, 268 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 3ff54d8..c0ccd8f 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -30,7 +30,7 @@
Name: VirtualBox-kmod
Version: 5.1.22
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -38,6 +38,7 @@ License: GPLv2 or CDDL
URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: VirtualBox-kmod-excludekernel-filter.txt
+patch1: vbox_fix_for_kernel_4.12_rf.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -60,6 +61,7 @@ Kernel module for VirtualBox
%prep
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
+%patch1 -p1
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
@@ -108,6 +110,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Fri Jun 30 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.22-3
+- Add patch for kernel 4.12
+
* Wed Jun 28 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 5.1.22-2
- Allow to build pre-built kmod on el
diff --git a/vbox_fix_for_kernel_4.12_rf.patch b/vbox_fix_for_kernel_4.12_rf.patch
new file mode 100644
index 0000000..5d51801
--- /dev/null
+++ b/vbox_fix_for_kernel_4.12_rf.patch
@@ -0,0 +1,262 @@
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxdrv/linux/SUPDrv-linux.c ./VirtualBox-kmod-5.1.22/vboxdrv/linux/SUPDrv-linux.c
+--- ./VirtualBox-kmod-5.1.22.orig/vboxdrv/linux/SUPDrv-linux.c 2017-06-16 10:06:54.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxdrv/linux/SUPDrv-linux.c 2017-06-30 15:12:13.603017580 +0100
+@@ -1403,7 +1403,7 @@ RTDECL(int) SUPR0Printf(const char *pszF
+ SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void)
+ {
+ uint32_t fFlags = 0;
+-#ifdef CONFIG_PAX_KERNEXEC
++#if defined(CONFIG_PAX_KERNEXEC) || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+ fFlags |= SUPKERNELFEATURES_GDT_READ_ONLY;
+ #endif
+ #if defined(VBOX_STRICT) || defined(VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV)
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxdrv/r0drv/linux/alloc-r0drv-linux.c ./VirtualBox-kmod-5.1.22/vboxdrv/r0drv/linux/alloc-r0drv-linux.c
+--- ./VirtualBox-kmod-5.1.22.orig/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2017-06-30 15:09:16.396055483 +0100
+@@ -35,6 +35,9 @@
+ #include <iprt/assert.h>
+ #include <iprt/err.h>
+ #include "r0drv/alloc-r0drv.h"
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include <asm/set_memory.h>
++#endif
+
+
+ #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP)
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c ./VirtualBox-kmod-5.1.22/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
+--- ./VirtualBox-kmod-5.1.22.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2017-06-30 15:14:27.621501849 +0100
+@@ -899,6 +899,9 @@ static struct page *rtR0MemObjLinuxVirtT
+ unsigned long pfn;
+ struct page *pPage;
+ pte_t *pEntry;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++ p4d_t p4d;
++#endif
+ union
+ {
+ pgd_t Global;
+@@ -917,9 +920,18 @@ static struct page *rtR0MemObjLinuxVirtT
+ u.Global = *pgd_offset(current->active_mm, ulAddr);
+ if (RT_UNLIKELY(pgd_none(u.Global)))
+ return NULL;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++ p4d = *p4d_offset(&u.Global, ulAddr);
++ if (RT_UNLIKELY(p4d_none(p4d) || p4d_large(p4d) || !p4d_present(p4d)))
++ return NULL;
++#endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++ u.Upper = *pud_offset(&p4d, ulAddr);
++#else
+ u.Upper = *pud_offset(&u.Global, ulAddr);
++#endif
+ if (RT_UNLIKELY(pud_none(u.Upper)))
+ return NULL;
+ # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+@@ -1463,13 +1475,23 @@ static int rtR0MemObjLinuxFixPte(struct
+ {
+ int rc = -ENOMEM;
+ pgd_t *pgd;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++ p4d_t *p4d;
++#endif
+
+ spin_lock(&mm->page_table_lock);
+
+ pgd = pgd_offset(mm, ulAddr);
+ if (!pgd_none(*pgd) && !pgd_bad(*pgd))
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++ p4d = p4d_offset(*pgd, ulAddr);
++ if (p4d_none(*p4d))
++ goto exit;
++ pmd_t *pmd = pmd_offset(p4d, ulAddr);
++#else
+ pmd_t *pmd = pmd_offset(pgd, ulAddr);
++#endif
+ if (!pmd_none(*pmd))
+ {
+ pte_t *ptep = pte_offset_map(pmd, ulAddr);
+@@ -1487,6 +1509,9 @@ static int rtR0MemObjLinuxFixPte(struct
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++exit:
++#endif
+ spin_unlock(&mm->page_table_lock);
+ return rc;
+ }
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxdrv/r0drv/linux/the-linux-kernel.h ./VirtualBox-kmod-5.1.22/vboxdrv/r0drv/linux/the-linux-kernel.h
+--- ./VirtualBox-kmod-5.1.22.orig/vboxdrv/r0drv/linux/the-linux-kernel.h 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxdrv/r0drv/linux/the-linux-kernel.h 2017-06-30 15:17:29.999522197 +0100
+@@ -320,6 +320,9 @@ DECLINLINE(unsigned long) msecs_to_jiffi
+ #endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include <asm/cacheflush.h>
++#endif
+ # define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
+ # define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
+ #else
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxguest/r0drv/linux/alloc-r0drv-linux.c ./VirtualBox-kmod-5.1.22/vboxguest/r0drv/linux/alloc-r0drv-linux.c
+--- ./VirtualBox-kmod-5.1.22.orig/vboxguest/r0drv/linux/alloc-r0drv-linux.c 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxguest/r0drv/linux/alloc-r0drv-linux.c 2017-06-30 15:09:16.396055483 +0100
+@@ -35,6 +35,9 @@
+ #include <iprt/assert.h>
+ #include <iprt/err.h>
+ #include "r0drv/alloc-r0drv.h"
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include <asm/set_memory.h>
++#endif
+
+
+ #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP)
+Only in ./VirtualBox-kmod-5.1.22/vboxguest/r0drv/linux: alloc-r0drv-linux.c.rej
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxguest/r0drv/linux/memobj-r0drv-linux.c ./VirtualBox-kmod-5.1.22/vboxguest/r0drv/linux/memobj-r0drv-linux.c
+--- ./VirtualBox-kmod-5.1.22.orig/vboxguest/r0drv/linux/memobj-r0drv-linux.c 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxguest/r0drv/linux/memobj-r0drv-linux.c 2017-06-30 15:08:32.185566058 +0100
+@@ -899,6 +899,9 @@ static struct page *rtR0MemObjLinuxVirtT
+ unsigned long pfn;
+ struct page *pPage;
+ pte_t *pEntry;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++ p4d_t p4d;
++#endif
+ union
+ {
+ pgd_t Global;
+@@ -917,9 +920,18 @@ static struct page *rtR0MemObjLinuxVirtT
+ u.Global = *pgd_offset(current->active_mm, ulAddr);
+ if (RT_UNLIKELY(pgd_none(u.Global)))
+ return NULL;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++ p4d = *p4d_offset(&u.Global, ulAddr);
++ if (RT_UNLIKELY(p4d_none(p4d) || p4d_large(p4d) || !p4d_present(p4d)))
++ return NULL;
++#endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++ u.Upper = *pud_offset(&p4d, ulAddr);
++#else
+ u.Upper = *pud_offset(&u.Global, ulAddr);
++#endif
+ if (RT_UNLIKELY(pud_none(u.Upper)))
+ return NULL;
+ # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+@@ -1463,13 +1475,23 @@ static int rtR0MemObjLinuxFixPte(struct
+ {
+ int rc = -ENOMEM;
+ pgd_t *pgd;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++ p4d_t *p4d;
++#endif
+
+ spin_lock(&mm->page_table_lock);
+
+ pgd = pgd_offset(mm, ulAddr);
+ if (!pgd_none(*pgd) && !pgd_bad(*pgd))
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++ p4d = p4d_offset(*pgd, ulAddr);
++ if (p4d_none(*p4d))
++ goto exit;
++ pmd_t *pmd = pmd_offset(p4d, ulAddr);
++#else
+ pmd_t *pmd = pmd_offset(pgd, ulAddr);
++#endif
+ if (!pmd_none(*pmd))
+ {
+ pte_t *ptep = pte_offset_map(pmd, ulAddr);
+@@ -1487,6 +1509,9 @@ static int rtR0MemObjLinuxFixPte(struct
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++exit:
++#endif
+ spin_unlock(&mm->page_table_lock);
+ return rc;
+ }
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxguest/r0drv/linux/the-linux-kernel.h ./VirtualBox-kmod-5.1.22/vboxguest/r0drv/linux/the-linux-kernel.h
+--- ./VirtualBox-kmod-5.1.22.orig/vboxguest/r0drv/linux/the-linux-kernel.h 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxguest/r0drv/linux/the-linux-kernel.h 2017-06-30 15:08:32.271567010 +0100
+@@ -320,6 +320,9 @@ DECLINLINE(unsigned long) msecs_to_jiffi
+ #endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include <asm/cacheflush.h>
++#endif
+ # define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
+ # define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
+ #else
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxnetadp/r0drv/linux/the-linux-kernel.h ./VirtualBox-kmod-5.1.22/vboxnetadp/r0drv/linux/the-linux-kernel.h
+--- ./VirtualBox-kmod-5.1.22.orig/vboxnetadp/r0drv/linux/the-linux-kernel.h 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxnetadp/r0drv/linux/the-linux-kernel.h 2017-06-30 15:17:29.999522197 +0100
+@@ -320,6 +320,9 @@ DECLINLINE(unsigned long) msecs_to_jiffi
+ #endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include <asm/cacheflush.h>
++#endif
+ # define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
+ # define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
+ #else
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxnetflt/r0drv/linux/the-linux-kernel.h ./VirtualBox-kmod-5.1.22/vboxnetflt/r0drv/linux/the-linux-kernel.h
+--- ./VirtualBox-kmod-5.1.22.orig/vboxnetflt/r0drv/linux/the-linux-kernel.h 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxnetflt/r0drv/linux/the-linux-kernel.h 2017-06-30 15:17:29.999522197 +0100
+@@ -320,6 +320,9 @@ DECLINLINE(unsigned long) msecs_to_jiffi
+ #endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include <asm/cacheflush.h>
++#endif
+ # define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
+ # define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
+ #else
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxpci/r0drv/linux/the-linux-kernel.h ./VirtualBox-kmod-5.1.22/vboxpci/r0drv/linux/the-linux-kernel.h
+--- ./VirtualBox-kmod-5.1.22.orig/vboxpci/r0drv/linux/the-linux-kernel.h 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxpci/r0drv/linux/the-linux-kernel.h 2017-06-30 15:17:29.999522197 +0100
+@@ -320,6 +320,9 @@ DECLINLINE(unsigned long) msecs_to_jiffi
+ #endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include <asm/cacheflush.h>
++#endif
+ # define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
+ # define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
+ #else
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxsf/r0drv/linux/the-linux-kernel.h ./VirtualBox-kmod-5.1.22/vboxsf/r0drv/linux/the-linux-kernel.h
+--- ./VirtualBox-kmod-5.1.22.orig/vboxsf/r0drv/linux/the-linux-kernel.h 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxsf/r0drv/linux/the-linux-kernel.h 2017-06-30 15:17:29.999522197 +0100
+@@ -320,6 +320,9 @@ DECLINLINE(unsigned long) msecs_to_jiffi
+ #endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include <asm/cacheflush.h>
++#endif
+ # define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
+ # define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
+ #else
+diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxvideo/include/the-linux-kernel.h ./VirtualBox-kmod-5.1.22/vboxvideo/include/the-linux-kernel.h
+--- ./VirtualBox-kmod-5.1.22.orig/vboxvideo/include/the-linux-kernel.h 2017-04-28 16:04:49.000000000 +0100
++++ ./VirtualBox-kmod-5.1.22/vboxvideo/include/the-linux-kernel.h 2017-06-30 15:17:29.999522197 +0100
+@@ -320,6 +320,9 @@ DECLINLINE(unsigned long) msecs_to_jiffi
+ #endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include <asm/cacheflush.h>
++#endif
+ # define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
+ # define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
+ #else
7 years
[caja-dropbox/f26] update to 1.18.0
by Wolfgang Ulbrich
Summary of changes:
388bcf7... update to 1.18.0 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years
[caja-dropbox] update to 1.18.0
by Wolfgang Ulbrich
commit 388bcf7f25eedd1dc33fe0953936ca0d1b088e96
Author: raveit65 <fedora(a)raveit.de>
Date: Thu Jun 29 18:19:51 2017 +0200
update to 1.18.0
.gitignore | 1 +
caja-dropbox.spec | 11 +++++++++--
sources | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7dc9e79..f447564 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ caja-dropbox-1.10.0.tar.xz
/caja-dropbox-1.15.0.tar.xz
/caja-dropbox-1.16.0.tar.xz
/caja-dropbox-1.17.0.tar.xz
+/caja-dropbox-1.18.0.tar.xz
diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index fc5b26d..7f96a9f 100644
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -3,8 +3,8 @@
Summary: Dropbox extension for caja
Name: caja-dropbox
-Version: 1.17.0
-Release: 2%{?dist}
+Version: 1.18.0
+Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
URL: http://git.mate-desktop.org/%{name}
@@ -13,7 +13,11 @@ Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar
ExclusiveArch: i686 x86_64
BuildRequires: caja-devel
+%if 0%{?fedora} >= 26
+BuildRequires: python2-docutils
+%else
BuildRequires: python-docutils
+%endif
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@@ -57,6 +61,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}
%changelog
+* Thu Jun 29 2017 Wolfgang Ulbrich <fedora(a)raveit.de> - 1.18.0-1
+- update to 1.18.0 release
+
* Sat Mar 25 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.17.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/sources b/sources
index 264f4f0..79c2060 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8721edd8168faf7dd78558d5d3fb5745 caja-dropbox-1.17.0.tar.xz
+f35289c4e93831f8f65bfc6d06f68dfc caja-dropbox-1.18.0.tar.xz
7 years
[chromium-libs-media-freeworld/el7] (7 commits) ...Sync with Fedora (aeacc87)
by Miro Hrončok
Summary of changes:
6e0d3b5... 59.0.3071.109 (*)
d0bdacb... fix path (*)
4b6e8a7... fix duplication between chrome-remote-desktop and chromium (*)
5efd1e8... use pretrans scriptlet to remove symlink on /etc/opt/chrome (*)
f88e197... moar chrome-remote-desktop fixes (*)
bf56117... Merge 'fedora/master' f88e197, 59.0.3071.109-4 (*)
d9ae7f1... Sync with Fedora (aeacc87) (*)
(*) This commit already existed in another branch; no separate mail sent
7 years
