From 267605136a8efcc4d0721665ec6d74215d3af3f2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 22 Mar 2018 14:28:50 +0100 Subject: [PATCH] Revert "Merge pull request #688 from mariux64/add-qtwebkit-and-new-rev-qtlinks" This reverts commit 76d6ade52173a02e3280385e6d0b1fcdd34afa24, reversing changes made to 7d5409b21733cacc5de2df0c62ed391621d28620. --- qtlinks.be0 => qtlinks-1.0.0-2.bee | 2 -- qtwebkit.be0 | 35 ------------------------ scripts/update-systemd-from-27-to-238.sh | 4 +-- 3 files changed, 2 insertions(+), 39 deletions(-) rename qtlinks.be0 => qtlinks-1.0.0-2.bee (96%) delete mode 100755 qtwebkit.be0 diff --git a/qtlinks.be0 b/qtlinks-1.0.0-2.bee similarity index 96% rename from qtlinks.be0 rename to qtlinks-1.0.0-2.bee index 6deb23aef..8fd968ed6 100755 --- a/qtlinks.be0 +++ b/qtlinks-1.0.0-2.bee @@ -1,7 +1,5 @@ #!/bin/env beesh -# BEE_VERSION qtlinks-1.0.0-4 - mee_install() { diff --git a/qtwebkit.be0 b/qtwebkit.be0 deleted file mode 100755 index f0bc8ec7d..000000000 --- a/qtwebkit.be0 +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION qtwebkit-5.9.0-0 - -SRCURL[0]="https://download.qt.io/community_releases/${PKGVERSION[2]}/${PKGVERSION}-final/qtwebkit-opensource-src-${PKGVERSION}.tar.xz" - -# PATCHURL+=() - -# EXCLUDE+=() - -# build_in_sourcedir - -# sourcesubdir_append src - - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -mee_configure() { - qmake ${S}/WebKit.pro -} - -mee_build() { - make ${BEE_MAKEFLAGS} -} - -mee_install() { - make INSTALL_ROOT=${D} install -} -## by default this may be 'make install DESTDIR="${D}"' diff --git a/scripts/update-systemd-from-27-to-238.sh b/scripts/update-systemd-from-27-to-238.sh index e2165df39..2f77bf327 100755 --- a/scripts/update-systemd-from-27-to-238.sh +++ b/scripts/update-systemd-from-27-to-238.sh @@ -16,10 +16,10 @@ systemctl daemon-reexec systemctl restart dbus.service # restarts GDM #bee remove consolekit-0.4.4-0.x86_64 # needed by GDM to log in #bee update fhs-3.0 # good idea? Removes /var/run? -bee update -f util-linux-2.31.1-1 xorg-server pulseaudio libgudev libusb xf86-input-evdev upower xf86-video-amdgpu xf86-video-nouveau gvfs-1.24.0-3 gnome-session-3.4.1-2 libatasmart qt5 udisks vlc-3.0.0-0 qtlinks +bee update -f util-linux-2.31.1-1 xorg-server pulseaudio libgudev libusb xf86-input-evdev upower xf86-video-amdgpu xf86-video-nouveau gvfs-1.24.0-3 gnome-session-3.4.1-2 libatasmart qt5 udisks vlc-3.0.0-0 bee remove systemd-27-0.x86_64 bee update -f systemd-238-0 -bee install udev_compat-1.0-0 qtwebkit-5.9.0-0 +bee install udev_compat-1.0-0 systemctl daemon-reload systemctl disable console-kit-daemon