+++ /dev/null
-pkgbase = aptpac
- pkgdesc = a pacman wrapper with syntax from debian's apt
- pkgver = 3.1.0
- pkgrel = 1
- url = https://github.com/FascodeNet/aptpac
- arch = any
- license = WTFPL
- makedepends = git
- depends = sudo
- conflicts = apt
- conflicts = apt-git
- conflicts = aptpac-git
- source = https://github.com/FascodeNet/aptpac/archive/v3.1.0.zip
- md5sums = SKIP
-
-pkgname = aptpac
-
+++ /dev/null
-# Maintaoner: Yamada Hayao <development@fascode.net>
-# Maintainer: Abraham Levine <echo iue@trnspljc.890 | tr ietursnpl890jc acprlsurecomed>
-
-pkgname=aptpac
-pkgver=3.1.0
-pkgrel=1
-pkgdesc="a pacman wrapper with syntax from debian's apt"
-arch=('any')
-url="https://github.com/FascodeNet/aptpac"
-license=('WTFPL')
-depends=('sudo')
-makedepends=('git')
-source=("${url}/archive/v${pkgver}.zip")
-md5sums=('SKIP')
-_gitname='aptpac'
-conflicts=('apt' 'apt-git' 'aptpac-git')
-
-
-package() {
- cd "${_gitname}-${pkgver}" &&
- install -m 755 -D aptpac "${pkgdir}/usr/bin/aptpac"
- install -m 755 -D LICENSE "${pkgdir}/usr/share/licenses/aptpac/LICENSE"
- cd "${pkgdir}/usr/bin/"
- ln -s "aptpac" "apt"
- ln -s "aptpac" "apt-get"
-}
+++ /dev/null
-pkgbase = compiz
- pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM
- pkgver = 0.9.14.1
- pkgrel = 3
- url = https://launchpad.net/compiz
- arch = i686
- arch = x86_64
- license = GPL
- license = LGPL
- license = MIT
- makedepends = boost
- makedepends = cmake
- makedepends = intltool
- makedepends = cython
- depends = boost-libs
- depends = xorg-server
- depends = fuse2
- depends = glibmm
- depends = libwnck3
- depends = python-gobject
- depends = python-cairo
- depends = protobuf
- depends = metacity
- depends = glu
- optdepends = xorg-xprop: grab various window properties for use in window matching rules
- provides = compiz-core=0.9.14.1
- provides = compiz-bcop=0.9.14.1
- provides = ccsm=0.9.14.1
- provides = compiz-plugins-main=0.9.14.1
- provides = compiz-plugins-extra=0.9.14.1
- provides = compizconfig-python=0.9.14.1
- provides = libcompizconfig=0.9.14.1
- conflicts = compiz-core
- conflicts = compiz-gtk
- conflicts = compiz-bcop
- conflicts = ccsm
- conflicts = compiz-fusion-plugins-main
- conflicts = compiz-fusion-plugins-extra
- conflicts = compiz-fusion-plugins-experimental
- conflicts = compizconfig-python
- conflicts = libcompizconfig
- conflicts = simple-ccsm
- source = https://launchpad.net/compiz/0.9.14/0.9.14.1/+download/compiz-0.9.14.1.tar.xz
- source = focus-prevention-disable.patch
- source = gtk-extents.patch
- source = reverse-unity-config.patch
- source = screenshot-launch-fix.patch
- source = no-compile-gschemas.patch
- source = gcc10_common_fix.patch
- sha256sums = 2505602b6c93d6565e681473df4157634268533c6874c3cdc9493b73b301ac52
- sha256sums = f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b
- sha256sums = 16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9
- sha256sums = 6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b
- sha256sums = 89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61
- sha256sums = 4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a
- sha256sums = eca2918214e81f742b7617ede20b81b8690ac723d756f690286e73ab3cbb6068
-
-pkgname = compiz
-
+++ /dev/null
-# Maintainer: Charles Bos <charlesbos1 AT gmail>
-# Contributor: Rob McCathie <archaur at rmcc dot com dot au
-# Contributor: /dev/rs0 <rs0@secretco.de.com>
-# Contributor: Iven Hsu <ivenvd AT gmail>
-# Contributor: Nathan Hulse <nat.hulse@gmail.com>
-
-pkgname=compiz
-pkgver=0.9.14.1
-pkgrel=3
-pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/compiz"
-license=('GPL' 'LGPL' 'MIT')
-depends=('boost-libs' 'xorg-server' 'fuse2' 'glibmm' 'libwnck3' 'python-gobject' 'python-cairo' 'protobuf' 'metacity' 'glu')
-makedepends=('boost' 'cmake' 'intltool' 'cython')
-optdepends=(
- 'xorg-xprop: grab various window properties for use in window matching rules'
-)
-conflicts=('compiz-core' 'compiz-gtk' 'compiz-bcop' 'ccsm' 'compiz-fusion-plugins-main' 'compiz-fusion-plugins-extra' 'compiz-fusion-plugins-experimental' 'compizconfig-python' 'libcompizconfig' 'simple-ccsm')
-provides=("compiz-core=${pkgver}" "compiz-bcop=${pkgver}" "ccsm=${pkgver}" "compiz-plugins-main=${pkgver}" "compiz-plugins-extra=${pkgver}" "compizconfig-python=${pkgver}" "libcompizconfig=${pkgver}")
-source=("https://launchpad.net/${pkgname}/${pkgver:0:6}/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz"
- "focus-prevention-disable.patch"
- "gtk-extents.patch"
- "reverse-unity-config.patch"
- "screenshot-launch-fix.patch"
- "no-compile-gschemas.patch"
- "gcc10_common_fix.patch")
-sha256sums=('2505602b6c93d6565e681473df4157634268533c6874c3cdc9493b73b301ac52'
- 'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
- '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
- '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
- '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
- '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a'
- '6268dfaaf72957388b6324f8cfac1daaa32a453e8f3b377dd522a38e6bf55469')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
-
- # Reverse Unity specific configuration patches
- patch -p1 -i "${srcdir}/reverse-unity-config.patch"
-
- # Set focus prevention level to off which means that new windows will always get focus
- patch -p1 -i "${srcdir}/focus-prevention-disable.patch"
-
- # Fix incorrect extents for GTK+ tooltips, csd etc
- patch -p1 -i "${srcdir}/gtk-extents.patch"
-
- # Fix application launching for the screenshot plugin
- patch -p1 -i "${srcdir}/screenshot-launch-fix.patch"
-
- # Don't try to compile gschemas during make install
- patch -p1 -i "${srcdir}/no-compile-gschemas.patch"
-
- # Fix linker error that gets raised with gcc 10 due to multiple definitions
- patch -p1 -i "${srcdir}/gcc10_common_fix.patch"
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
-
- mkdir build; cd build
-
- cmake .. \
- -DCMAKE_BUILD_TYPE="Release" \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- -DCMAKE_INSTALL_LIBDIR="/usr/lib" \
- -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On \
- -DCOMPIZ_BUILD_WITH_RPATH=Off \
- -DCOMPIZ_PACKAGING_ENABLED=On \
- -DBUILD_GTK=On \
- -DBUILD_METACITY=On \
- -DBUILD_KDE4=Off \
- -DCOMPIZ_BUILD_TESTING=Off \
- -DCOMPIZ_WERROR=Off \
- -DCOMPIZ_DEFAULT_PLUGINS="composite,opengl,decor,resize,place,move,compiztoolbox,staticswitcher,regex,animation,wall,ccp"
-
- make
-}
-
-package() {
- cd "${pkgname}-${pkgver}/build"
- make DESTDIR="${pkgdir}" install
-
- # findcompiz_install needs COMPIZ_DESTDIR and install needs DESTDIR
- # make findcompiz_install
- CMAKE_DIR=$(cmake --system-information | grep '^CMAKE_ROOT' | awk -F\" '{print $2}')
- install -dm755 "${pkgdir}${CMAKE_DIR}/Modules/"
- install -m644 ../cmake/FindCompiz.cmake "${pkgdir}${CMAKE_DIR}/Modules/"
-
- # Add documentation
- install -dm755 "${pkgdir}/usr/share/doc/compiz/"
- install ../{AUTHORS,NEWS,README} "${pkgdir}/usr/share/doc/compiz/"
-
- # Add the gsettings schema files
- if ls generated/glib-2.0/schemas/ | grep -qm1 .gschema.xml; then
- install -dm755 "${pkgdir}/usr/share/glib-2.0/schemas/"
- install -m644 generated/glib-2.0/schemas/*.gschema.xml "${pkgdir}/usr/share/glib-2.0/schemas/"
- fi
-
- # Install licenses
- install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 "${srcdir}/${pkgname}-${pkgver}"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
+++ /dev/null
-diff -Naur original/metadata/core.xml.in modified/metadata/core.xml.in
---- original/metadata/core.xml.in 2013-07-23 20:58:03.000000000 +0100
-+++ modified/metadata/core.xml.in 2014-06-11 09:06:53.839302487 +0100
-@@ -114,7 +114,7 @@
- <_long>Level of focus stealing prevention</_long>
- <min>0</min>
- <max>4</max>
-- <default>1</default>
-+ <default>0</default>
- <desc>
- <value>0</value>
- <_name>Off</_name>
+++ /dev/null
-From c7b74aa53e9d64da5175f9b86ec7f68e53d1398e Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Tue, 28 Jul 2020 12:17:30 +0200
-Subject: Fix two build failures due to new gcc-10 warnings, such as
- uninitialized variables and duplicated definitions:
-
-e.g. of failure:
-/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-settings-xproperty-storage.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
-/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-theme.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
-/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-theme-cairo.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
-/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-theme-metacity.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
-collect2: error: ld returned 1 exit status
----
- debian/changelog | 14 ++++++++++++++
- gtk/window-decorator/gtk-window-decorator.h | 2 +-
- plugins/expo/src/expo.cpp | 2 +-
- 3 files changed, 16 insertions(+), 2 deletions(-)
-
-#diff --git a/debian/changelog b/debian/changelog
-#index 97b93dd..b21831d 100644
-#--- a/debian/changelog
-#+++ b/debian/changelog
-#@@ -1,3 +1,17 @@
-#+compiz (1:0.9.14.1+20.10.20200526-0ubuntu3) groovy; urgency=medium
-#+
-#+ * Initialize 3 arrays to zero to silence a new gcc-10 warning
-#+ * Move window_type_frames to extern in the header file, fixing a build
-#+ failure with gcc-10
-#+
-#+ -- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 28 Jul 2020 11:39:45 +0200
-#+
-#+compiz (1:0.9.14.1+20.10.20200526-0ubuntu2) groovy; urgency=medium
-#+
-#+ * Rebuild against new libprotobuf23.
-#+
-#+ -- Gianfranco Costamagna <locutusofborg@debian.org> Sun, 26 Jul 2020 10:13:56 +0200
-#+
-# compiz (1:0.9.14.1+20.10.20200526-0ubuntu1) groovy; urgency=medium
-#
-# [ Daniel Kondor ]
-diff --git a/gtk/window-decorator/gtk-window-decorator.h b/gtk/window-decorator/gtk-window-decorator.h
-index 6bf5d31..da7f905 100644
---- a/gtk/window-decorator/gtk-window-decorator.h
-+++ b/gtk/window-decorator/gtk-window-decorator.h
-@@ -266,7 +266,7 @@ typedef struct _default_frame_references
- } default_frame_references_t;
-
- extern default_frame_references_t default_frames[WINDOW_TYPE_FRAMES_NUM * 2];
--const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
-+extern const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
-
- extern char *program_name;
-
-diff --git a/plugins/expo/src/expo.cpp b/plugins/expo/src/expo.cpp
-index 86c1618..802071b 100644
---- a/plugins/expo/src/expo.cpp
-+++ b/plugins/expo/src/expo.cpp
-@@ -708,7 +708,7 @@ ExpoScreen::invertTransformedVertex (const GLScreenPaintAttrib &attrib,
- int vertex[2])
- {
- GLMatrix sTransform (transform);
-- float p1[3], p2[3], v[3];
-+ float p1[3] = { 0 } , p2[3] = { 0 }, v[3] = { 0 };
- GLint viewport[4];
-
- gScreen->glApplyTransform (attrib, output, &sTransform);
---
-cgit v1.1
-
+++ /dev/null
-# Diff from https://code.launchpad.net/~albertsmuktupavels/compiz/add-gtk-frame-extents-to-net-supported/+merge/257303
-=== modified file 'src/screen.cpp'
---- a/src/screen.cpp 2014-12-02 19:37:10 +0000
-+++ b/src/screen.cpp 2015-04-23 20:41:24 +0000
-@@ -2362,6 +2362,7 @@
-
- atoms.push_back (Atoms::wmUserTime);
- atoms.push_back (Atoms::frameExtents);
-+ atoms.push_back (Atoms::frameGtkExtents);
- atoms.push_back (Atoms::frameWindow);
-
- atoms.push_back (Atoms::winState);
-
+++ /dev/null
-diff -Nur original/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake modified/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake
---- original/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake 2019-02-16 12:44:41.000000000 +0000
-+++ modified/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake 2019-02-16 23:36:58.589706824 +0000
-@@ -15,9 +15,9 @@
-
- find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas)
-
--if (GLIB_COMPILE_SCHEMAS)
--
-- message ("-- Recompiling GSettings schemas in ${SCHEMADIR}")
-- execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${SCHEMADIR})
--
--endif (GLIB_COMPILE_SCHEMAS)
-+#if (GLIB_COMPILE_SCHEMAS)
-+#
-+# message ("-- Recompiling GSettings schemas in ${SCHEMADIR}")
-+# execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${SCHEMADIR})
-+#
-+#endif (GLIB_COMPILE_SCHEMAS)
+++ /dev/null
-diff -Nur original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
---- original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2019-02-16 12:44:41.000000000 +0000
-+++ modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2019-02-17 14:11:58.762747647 +0000
-@@ -10,9 +10,6 @@
- <key type="s" name="command-screenshot">
- <default>"gnome-screenshot"</default>
- </key>
-- <key type="as" name="run-command-21">
-- <default>["<Control><Alt>Delete"]</default>
-- </key>
- <key type="as" name="run-command-12">
- <default>["Disabled"]</default>
- </key>
-@@ -49,9 +46,6 @@
- <key type="as" name="run-command-1">
- <default>["Disabled"]</default>
- </key>
-- <key type="s" name="command-21">
-- <default>"/usr/bin/gnome-system-monitor -p"</default>
-- </key>
- <key type="s" name="command-12">
- <default>""</default>
- </key>
-diff -Nur original/metadata/core.xml.in modified/metadata/core.xml.in
---- original/metadata/core.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/metadata/core.xml.in 2019-02-17 14:11:58.762747647 +0000
-@@ -144,7 +144,7 @@
- <option name="focus_prevention_match" type="match">
- <_short>Focus Prevention Windows</_short>
- <_long>Focus prevention windows</_long>
-- <default>!(class=Polkit-gnome-authentication-agent-1)</default>
-+ <default>any</default>
- </option>
- </group>
- <group>
-@@ -179,7 +179,7 @@
- <option name="minimize_window_key" type="key">
- <_short>Minimize Window</_short>
- <_long>Minimize active window</_long>
-- <default><Control><Alt>KP_0</default>
-+ <default><Alt>F9</default>
- </option>
- <option name="minimize_window_button" type="button">
- <_short>Minimize Window</_short>
-@@ -188,16 +188,16 @@
- <option name="maximize_window_key" type="key">
- <_short>Maximize Window</_short>
- <_long>Maximize active window</_long>
-- <default><Control><Super>Up</default>
-+ <default><Alt>F10</default>
- </option>
- <option name="unmaximize_window_key" type="key">
- <_short>Unmaximize Window</_short>
- <_long>Unmaximize active window</_long>
-+ <default><Alt>F5</default>
- </option>
- <option name="unmaximize_or_minimize_window_key" type="key">
- <_short>Unmaximize or Minimize Window</_short>
- <_long>Unmaximize or minimize active window</_long>
-- <default><Control><Super>Down</default>
- </option>
- <option name="maximize_window_horizontally_key" type="key">
- <_short>Maximize Window Horizontally</_short>
-@@ -220,6 +220,7 @@
- <option name="show_desktop_key" type="key">
- <_short>Show Desktop</_short>
- <_long>Hide all windows and focus desktop</_long>
-+ <default><Control><Alt>d</default>
- </option>
- <option name="show_desktop_edge" type="edge">
- <_short>Show Desktop</_short>
-@@ -229,7 +230,6 @@
- <option name="toggle_window_maximized_key" type="key">
- <_short>Toggle Window Maximized</_short>
- <_long>Toggle active window maximized</_long>
-- <default><Control><Alt>KP_5</default>
- </option>
- <option name="toggle_window_maximized_button" type="button">
- <_short>Toggle Window Maximized</_short>
-@@ -254,7 +254,7 @@
- <option name="hsize" type="int">
- <_short>Horizontal Virtual Size</_short>
- <_long>Screen size multiplier for horizontal virtual size</_long>
-- <default>1</default>
-+ <default>4</default>
- <min>1</min>
- <max>32</max>
- </option>
-diff -Nur original/plugins/animation/animation.xml.in modified/plugins/animation/animation.xml.in
---- original/plugins/animation/animation.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/animation/animation.xml.in 2019-02-17 14:11:58.766082647 +0000
-@@ -36,7 +36,7 @@
- <extensible/>
- <sort start="2"/>
- <default>
-- <value>animation:Glide 2</value>
-+ <value>animation:Zoom</value>
- <value>animation:Fade</value>
- <value>animation:Fade</value>
- </default>
-@@ -48,9 +48,9 @@
- <min>50</min>
- <max>4000</max>
- <default>
-- <value>120</value>
-- <value>80</value>
-- <value>80</value>
-+ <value>200</value>
-+ <value>150</value>
-+ <value>150</value>
- </default>
- </option>
- <option name="open_matches" type="list">
-@@ -58,8 +58,8 @@
- <_long>The windows that will be animated.</_long>
- <type>match</type>
- <default>
-- <value>((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver)</value>
-- <value>((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\\.exe$))</value>
-+ <value>(type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver)</value>
-+ <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value>
- <value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value>
- </default>
- </option>
-@@ -102,7 +102,7 @@
- <extensible/>
- <sort start="2"/>
- <default>
-- <value>animation:Glide 2</value>
-+ <value>animation:Zoom</value>
- <value>animation:Fade</value>
- <value>animation:Fade</value>
- </default>
-@@ -114,9 +114,9 @@
- <min>50</min>
- <max>4000</max>
- <default>
-- <value>120</value>
-- <value>80</value>
-- <value>50</value>
-+ <value>200</value>
-+ <value>150</value>
-+ <value>150</value>
- </default>
- </option>
- <option name="close_matches" type="list">
-@@ -124,8 +124,8 @@
- <_long>The windows that will be animated.</_long>
- <type>match</type>
- <default>
-- <value>((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver) & !(name=gnome-screenshot)</value>
-- <value>((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\\.exe$))</value>
-+ <value>(type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver)</value>
-+ <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value>
- <value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value>
- </default>
- </option>
-@@ -168,7 +168,7 @@
- <extensible/>
- <sort start="2"/>
- <default>
-- <value>animation:Zoom</value>
-+ <value>animation:Magic Lamp</value>
- </default>
- </option>
- <option name="minimize_durations" type="list">
-@@ -178,7 +178,7 @@
- <min>50</min>
- <max>4000</max>
- <default>
-- <value>220</value>
-+ <value>300</value>
- </default>
- </option>
- <option name="minimize_matches" type="list">
-@@ -341,7 +341,7 @@
- <extensible/>
- <sort start="1"/>
- <default>
-- <value>animation:Fade</value>
-+ <value>animation:None</value>
- </default>
- </option>
- <option name="focus_durations" type="list">
-@@ -351,7 +351,7 @@
- <min>50</min>
- <max>4000</max>
- <default>
-- <value>150</value>
-+ <value>300</value>
- </default>
- </option>
- <option name="focus_matches" type="list">
-@@ -385,7 +385,7 @@
- <option name="time_step" type="int">
- <_short>Animation Time Step</_short>
- <_long>The amount of time in milliseconds between each render of the animation. The higher the number, the jerkier the movements become.</_long>
-- <default>16</default>
-+ <default>10</default>
- <min>1</min>
- <max>400</max>
- </option>
-@@ -473,7 +473,7 @@
- <option name="glide2_away_position" type="float">
- <_short>Away Position</_short>
- <_long>Closeness of window to camera at the end of the animation (1.0: Close to camera, -2.0: Away from camera).</_long>
-- <default>-0.1</default>
-+ <default>-0.4</default>
- <min>-2</min>
- <max>1</max>
- <precision>0.05</precision>
-@@ -481,7 +481,7 @@
- <option name="glide2_away_angle" type="float">
- <_short>Away Angle</_short>
- <_long>Angle of window at the end of the animation.</_long>
-- <default>0</default>
-+ <default>-45</default>
- <min>-540</min>
- <max>540</max>
- <precision>5</precision>
-@@ -686,7 +686,7 @@
- <option name="zoom_springiness" type="float">
- <_short>Springiness</_short>
- <_long>How spring-like the Zoom animation should be.</_long>
-- <default>0.08</default>
-+ <default>0.0</default>
- <min>0</min>
- <max>1</max>
- <precision>0.01</precision>
-diff -Nur original/plugins/commands/commands.xml.in modified/plugins/commands/commands.xml.in
---- original/plugins/commands/commands.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/commands/commands.xml.in 2019-02-17 14:11:58.766082647 +0000
-@@ -117,7 +117,7 @@
- <option name="command20" type="string">
- <_short>Command line 20</_short>
- <_long>Command line to be executed in shell when run_command20 is invoked</_long>
-- <default>/usr/bin/gnome-system-monitor -p</default>
-+ <default></default>
- </option>
- </group>
- <group>
-@@ -205,7 +205,6 @@
- <option name="run_command20_key" type="key">
- <_short>Run command 20</_short>
- <_long>A keybinding that when invoked, will run the shell command identified by command20</_long>
-- <default><Control><Alt>Delete</default>
- </option>
- </group>
- <group>
-diff -Nur original/plugins/decor/decor.xml.in modified/plugins/decor/decor.xml.in
---- original/plugins/decor/decor.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/decor/decor.xml.in 2019-02-17 14:13:24.345517674 +0000
-@@ -31,7 +31,7 @@
- <option name="active_shadow_opacity" type="float">
- <_short>Shadow Opacity</_short>
- <_long>Drop shadow opacity</_long>
-- <default>0.8</default>
-+ <default>0.5</default>
- <min>0.01</min>
- <max>6.0</max>
- <precision>0.01</precision>
-@@ -66,7 +66,7 @@
- <option name="inactive_shadow_radius" type="float">
- <_short>Shadow Radius</_short>
- <_long>Drop shadow radius</_long>
-- <default>5.0</default>
-+ <default>8.0</default>
- <min>0.1</min>
- <max>13.0</max>
- <precision>0.1</precision>
-@@ -74,7 +74,7 @@
- <option name="inactive_shadow_opacity" type="float">
- <_short>Shadow Opacity</_short>
- <_long>Drop shadow opacity</_long>
-- <default>0.4</default>
-+ <default>0.5</default>
- <min>0.01</min>
- <max>6.0</max>
- <precision>0.01</precision>
-@@ -101,7 +101,7 @@
- <option name="command" type="string">
- <_short>Command</_short>
- <_long>Decorator command line that is executed if no decorator is already running.</_long>
-- <default>gtk-window-decorator</default>
-+ <default>exec /usr/bin/compiz-decorator</default>
- </option>
- <option name="mipmap" type="bool">
- <_short>Mipmap</_short>
-diff -Nur original/plugins/expo/expo.xml.in modified/plugins/expo/expo.xml.in
---- original/plugins/expo/expo.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/expo/expo.xml.in 2019-02-17 14:11:58.766082647 +0000
-@@ -17,7 +17,6 @@
- <plugin>wobbly</plugin>
- <plugin>animation</plugin>
- <plugin>wallpaper</plugin>
-- <plugin>imgpng</plugin>
- </relation>
- </deps>
- <options>
-@@ -26,7 +25,7 @@
- <option name="expo_key" type="key">
- <_short>Expo Key</_short>
- <_long>Initiate or terminate Expo mode with this keyboard shortcut.</_long>
-- <default><Super>s</default>
-+ <default><Super>e</default>
- </option>
- <option name="expo_button" type="button">
- <_short>Expo Button</_short>
-@@ -37,6 +36,7 @@
- <_short>Expo Corner/Edge</_short>
- <_long>Initiate or terminate Expo mode by moving the pointer to this corner or edge of your screen(s).</_long>
- <default>
-+ <edge name="TopLeft"/>
- </default>
- </option>
- <option name="double_click_time" type="int">
-@@ -80,7 +80,7 @@
- <option name="zoom_time" type="float">
- <_short>Animation Duration</_short>
- <_long>Duration of the selected animation (in seconds).</_long>
-- <default>0.3</default>
-+ <default>0.5</default>
- <min>0.1</min>
- <max>5.0</max>
- <precision>0.1</precision>
-@@ -146,12 +146,12 @@
- <option name="x_offset" type="int">
- <_short>X Offset</_short>
- <_long>Horizontal offset (in pixels).</_long>
-- <default>64</default>
-+ <default>0</default>
- </option>
- <option name="y_offset" type="int">
- <_short>Y Offset</_short>
- <_long>Vertical offset (in pixels).</_long>
-- <default>24</default>
-+ <default>0</default>
- </option>
- <option name="y_bottom_offset" type="int">
- <_short>Y Bottom Offset</_short>
-@@ -170,7 +170,7 @@
- <option name="vp_distance" type="float">
- <_short>Viewport Distance</_short>
- <_long>The distance between viewports in Expo mode.</_long>
-- <default>0.2</default>
-+ <default>0.10</default>
- <min>0.0</min>
- <max>1.0</max>
- <precision>0.01</precision>
-@@ -198,7 +198,7 @@
- <_long>How the Expo wall should be displayed, if multiple output devices are used.</_long>
- <min>0</min>
- <max>1</max>
-- <default>1</default>
-+ <default>0</default>
- <desc>
- <value>0</value>
- <_name>One big wall</_name>
-@@ -213,7 +213,7 @@
- <option name="vp_brightness" type="float">
- <_short>Brightness</_short>
- <_long>The brightness of unfocused viewports (in percent).</_long>
-- <default>40.0</default>
-+ <default>75.0</default>
- <min>0.0</min>
- <max>100.0</max>
- <precision>0.1</precision>
-@@ -233,7 +233,7 @@
- <red>0xfbfb</red>
- <green>0x8b8b</green>
- <blue>0x0</blue>
-- <alpha>0xffff</alpha>
-+ <alpha>0x0</alpha>
- </default>
- </option>
- </subgroup>
-@@ -242,7 +242,7 @@
- <option name="reflection" type="bool">
- <_short>Reflection</_short>
- <_long>Render a realtime reflection of the viewports on the ground.</_long>
-- <default>false</default>
-+ <default>true</default>
- </option>
- <option name="ground_color1" type="color">
- <_short>Ground Color (near)</_short>
-diff -Nur original/plugins/ezoom/ezoom.xml.in modified/plugins/ezoom/ezoom.xml.in
---- original/plugins/ezoom/ezoom.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/ezoom/ezoom.xml.in 2019-02-17 14:11:58.766082647 +0000
-@@ -30,7 +30,7 @@
- <option type="button" name="zoom_in_button">
- <_short>Zoom In Button</_short>
- <_long>Mouse button shortcut to invoke zooming in.</_long>
-- <default></default>
-+ <default><Super>Button4</default>
- </option>
- <option type="key" name="zoom_in_key">
- <_short>Zoom In Key</_short>
-@@ -39,7 +39,7 @@
- <option type="button" name="zoom_out_button">
- <_short>Zoom Out Button</_short>
- <_long>Mouse button shortcut to invoke zooming out.</_long>
-- <default></default>
-+ <default><Super>Button5</default>
- </option>
- <option type="key" name="zoom_out_key">
- <_short>Zoom Out Key</_short>
-@@ -48,7 +48,7 @@
- <option type="button" name="zoom_box_button">
- <_short>Invoke Zoom Box Button</_short>
- <_long>Define a rectangle area and zoom into it.</_long>
-- <default></default>
-+ <default><Super>Button2</default>
- </option>
- <option name="zoom_box_outline_color" type="color">
- <_short>Zoom Box Outline Color</_short>
-@@ -346,7 +346,7 @@
- <option type="key" name="fit_to_window_key">
- <_short>Fit zoomed area to window</_short>
- <_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.</_long>
-- <default></default>
-+ <default><Super>r</default>
- </option>
- </subgroup>
- </group>
-diff -Nur original/plugins/fade/fade.xml.in modified/plugins/fade/fade.xml.in
---- original/plugins/fade/fade.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/fade/fade.xml.in 2019-02-17 14:11:58.772752647 +0000
-@@ -10,7 +10,6 @@
- </requirement>
- <relation type="after">
- <plugin>decor</plugin>
-- <plugin>staticswitcher</plugin>
- </relation>
- <relation type="before">
- <plugin>cube</plugin>
-@@ -51,7 +50,7 @@
- <option name="window_match" type="match">
- <_short>Fade windows</_short>
- <_long>Windows that should be fading</_long>
-- <default>any & !(title=notify-osd)</default>
-+ <default>any</default>
- </option>
- <option name="visual_bell" type="bell">
- <_short>Visual Bell</_short>
-diff -Nur original/plugins/gnomecompat/gnomecompat.xml.in modified/plugins/gnomecompat/gnomecompat.xml.in
---- original/plugins/gnomecompat/gnomecompat.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/gnomecompat/gnomecompat.xml.in 2019-02-17 14:11:58.772752647 +0000
-@@ -57,7 +57,6 @@
- <option name="run_command_terminal_key" type="key">
- <_short>Open a terminal</_short>
- <_long>Open a terminal</_long>
-- <default><Control><Alt>T</default>
- </option>
- </group>
- </options>
-diff -Nur original/plugins/grid/grid.xml.in modified/plugins/grid/grid.xml.in
---- original/plugins/grid/grid.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/grid/grid.xml.in 2019-02-17 14:11:58.779422647 +0000
-@@ -68,12 +68,12 @@
- <option name="put_maximize_key" type="key">
- <_short>Maximize Key</_short>
- <_long>Maximize window.</_long>
-- <default><Control><Super>Up</default>
-+ <default><Control><Alt>KP_0</default>
- </option>
- <option name="put_restore_key" type="key">
- <_short>Restore</_short>
- <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long>
-- <default><Control><Super>Down</default>
-+ <default><Alt>F5</default>
- </option>
- <option name="left_maximize" type="key">
- <_short>Left Maximize</_short>
-diff -Nur original/plugins/resize/resize.xml.in modified/plugins/resize/resize.xml.in
---- original/plugins/resize/resize.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/resize/resize.xml.in 2019-02-17 14:11:58.779422647 +0000
-@@ -56,7 +56,7 @@
- <option name="maximize_vertically" type="bool">
- <short>Maximize Vertically if screen edge hit</short>
- <long>Maximizes the window vertically if the top or bottom screen edge is hit while resizing</long>
-- <default>true</default>
-+ <default>false</default>
- </option>
- <option name="increase_border_contrast" type="bool">
- <_short>Use a double-border in 'Rectangle' and 'Outline' modes</_short>
-@@ -72,9 +72,9 @@
- <_short>Border Color</_short>
- <_long>Border color used for outline and rectangle resize modes</_long>
- <default>
-- <red>0xfbfb</red>
-- <green>0x8b8b</green>
-- <blue>0x0</blue>
-+ <red>0x2f2f</red>
-+ <green>0x2f2f</green>
-+ <blue>0x4f4f</blue>
- <alpha>0x9f9f</alpha>
- </default>
- </option>
-@@ -82,10 +82,10 @@
- <_short>Fill Color</_short>
- <_long>Fill color used for rectangle resize mode</_long>
- <default>
-- <red>0xfbfb</red>
-- <green>0x8b8b</green>
-- <blue>0x0</blue>
-- <alpha>0x1919</alpha>
-+ <red>0x2f2f</red>
-+ <green>0x2f2f</green>
-+ <blue>0x4f4f</blue>
-+ <alpha>0x4f4f</alpha>
- </default>
- </option>
- <option name="disable_blend" type="bool">
-diff -Nur original/plugins/scale/scale.xml.in modified/plugins/scale/scale.xml.in
---- original/plugins/scale/scale.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/scale/scale.xml.in 2019-02-17 14:11:58.779422647 +0000
-@@ -21,7 +21,7 @@
- <option name="spacing" type="int">
- <_short>Spacing</_short>
- <_long>Space between windows</_long>
-- <default>20</default>
-+ <default>10</default>
- <min>0</min>
- <max>250</max>
- </option>
-@@ -46,7 +46,7 @@
- <option name="speed" type="float">
- <_short>Speed</_short>
- <_long>Scale speed</_long>
-- <default>5.0</default>
-+ <default>1.5</default>
- <min>0.1</min>
- <max>50</max>
- <precision>0.1</precision>
-@@ -54,7 +54,7 @@
- <option name="timestep" type="float">
- <_short>Timestep</_short>
- <_long>Scale timestep</_long>
-- <default>0.1</default>
-+ <default>1.2</default>
- <min>0.1</min>
- <max>50</max>
- <precision>0.1</precision>
-@@ -67,7 +67,7 @@
- <option name="opacity" type="int">
- <_short>Opacity</_short>
- <_long>Amount of opacity in percent</_long>
-- <default>100</default>
-+ <default>75</default>
- <min>0</min>
- <max>100</max>
- </option>
-@@ -76,7 +76,7 @@
- <_long>Overlay an icon on windows once they are scaled</_long>
- <min>0</min>
- <max>2</max>
-- <default>0</default>
-+ <default>1</default>
- <desc>
- <value>0</value>
- <_name>None</_name>
-@@ -129,7 +129,7 @@
- <_long>Selects where windows are scaled if multiple output devices are used.</_long>
- <min>0</min>
- <max>1</max>
-- <default>1</default>
-+ <default>0</default>
- <desc>
- <value>0</value>
- <_name>On current output device</_name>
-@@ -150,7 +150,7 @@
- <option name="key_bindings_toggle" type="bool">
- <_short>Key Bindings Toggle Scale Mode</_short>
- <_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long>
-- <default>true</default>
-+ <default>false</default>
- </option>
- <option name="button_bindings_toggle" type="bool">
- <_short>Button Bindings Toggle Scale Mode</_short>
-@@ -160,12 +160,15 @@
- <option name="initiate_edge" type="edge">
- <_short>Initiate Window Picker</_short>
- <_long>Layout and start transforming windows</_long>
-+ <default>
-+ <edge name="TopRight"/>
-+ </default>
- <allowed edgednd="true"/>
- </option>
- <option name="initiate_key" type="key">
- <_short>Initiate Window Picker</_short>
- <_long>Layout and start transforming windows</_long>
-- <default><Super>w</default>
-+ <default><Shift><Alt>Up</default>
- </option>
- <option name="initiate_button" type="button">
- <_short>Initiate Window Picker</_short>
-@@ -183,7 +186,6 @@
- <option name="initiate_all_key" type="key">
- <_short>Initiate Window Picker For All Windows</_short>
- <_long>Layout and start transforming all windows</_long>
-- <default><Super><Shift>w</default>
- </option>
- <option name="initiate_group_edge" type="edge">
- <_short>Initiate Window Picker For Window Group</_short>
-diff -Nur original/plugins/staticswitcher/staticswitcher.xml.in modified/plugins/staticswitcher/staticswitcher.xml.in
---- original/plugins/staticswitcher/staticswitcher.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/staticswitcher/staticswitcher.xml.in 2019-02-17 14:11:58.782757647 +0000
-@@ -11,6 +11,7 @@
- <relation type="after">
- <plugin>composite</plugin>
- <plugin>opengl</plugin>
-+ <plugin>fade</plugin>
- <plugin>compiztoolbox</plugin>
- <plugin>decor</plugin>
- </relation>
-@@ -139,12 +140,12 @@
- <option name="auto_change_vp" type="bool">
- <_short>Auto Change Viewport</_short>
- <_long>Change to the viewport of the selected window while switching</_long>
-- <default>true</default>
-+ <default>false</default>
- </option>
- <option name="popup_delay" type="float">
- <_short>Popup Window Delay</_short>
- <_long>Time (in s) the popup window should be delayed before appearing</_long>
-- <default>0.2</default>
-+ <default>0.0</default>
- <min>0.0</min>
- <max>2.0</max>
- <precision>0.05</precision>
-@@ -152,7 +153,7 @@
- <option name="mouse_select" type="bool">
- <_short>Allow Mouse Selection</_short>
- <_long>Allow selection of windows from the switcher window with the mouse</_long>
-- <default>true</default>
-+ <default>false</default>
- </option>
- </group>
- <group>
-@@ -160,14 +161,14 @@
- <option name="saturation" type="int">
- <_short>Saturation</_short>
- <_long>Amount of saturation in percent</_long>
-- <default>100</default>
-+ <default>50</default>
- <min>0</min>
- <max>100</max>
- </option>
- <option name="brightness" type="int">
- <_short>Brightness</_short>
- <_long>Amount of brightness in percent</_long>
-- <default>100</default>
-+ <default>50</default>
- <min>0</min>
- <max>100</max>
- </option>
-@@ -191,7 +192,7 @@
- <option name="mipmap" type="bool">
- <_short>Mipmap</_short>
- <_long>Generate mipmaps when possible for higher quality scaling</_long>
-- <default>false</default>
-+ <default>true</default>
- </option>
- <option name="row_align" type="int">
- <_short>Row Alignment</_short>
-@@ -220,7 +221,7 @@
- <option name="bring_to_front" type="bool">
- <_short>Bring To Front</_short>
- <_long>Bring selected window to front</_long>
-- <default>false</default>
-+ <default>true</default>
- </option>
- <_short>Selected Window Highlight</_short>
- <option name="highlight_mode" type="int">
-@@ -228,7 +229,7 @@
- <_long>Mode for highlighting the currently selected window</_long>
- <min>0</min>
- <max>2</max>
-- <default>0</default>
-+ <default>1</default>
- <desc>
- <value>0</value>
- <_name>None</_name>
-diff -Nur original/plugins/vpswitch/vpswitch.xml.in modified/plugins/vpswitch/vpswitch.xml.in
---- original/plugins/vpswitch/vpswitch.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/vpswitch/vpswitch.xml.in 2019-02-17 14:11:58.782757647 +0000
-@@ -95,11 +95,13 @@
- <option name="next_button" type="button">
- <_short>Move Next</_short>
- <_long>Move to the next viewport</_long>
-+ <default>Button5</default>
- <internal/>
- </option>
- <option name="prev_button" type="button">
- <_short>Move Prev</_short>
- <_long>Move to the previous viewport</_long>
-+ <default>Button4</default>
- <internal/>
- </option>
- <option name="initiate_button" type="button">
-diff -Nur original/plugins/wall/wall.xml.in modified/plugins/wall/wall.xml.in
---- original/plugins/wall/wall.xml.in 2019-02-16 12:44:41.000000000 +0000
-+++ modified/plugins/wall/wall.xml.in 2019-02-17 14:11:58.782757647 +0000
-@@ -30,12 +30,12 @@
- <option name="miniscreen" type="bool">
- <_short>Show Live Viewport Previews</_short>
- <_long>Show live viewport previews in switcher window</_long>
-- <default>true</default>
-+ <default>false</default>
- </option>
- <option name="preview_timeout" type="float">
- <_short>Switch Target Preview Visibility Time</_short>
- <_long>Duration (in s) the switch target preview should remain visible after switching ends.</_long>
-- <default>0.2</default>
-+ <default>0.4</default>
- <min>0.0</min>
- <max>2.0</max>
- <precision>0.05</precision>
-@@ -43,7 +43,7 @@
- <option name="preview_scale" type="int">
- <_short>Preview Scale</_short>
- <_long>Size of the preview in %</_long>
-- <default>130</default>
-+ <default>100</default>
- <min>0</min>
- <max>400</max>
- </option>
-@@ -57,7 +57,7 @@
- <option name="border_width" type="int">
- <_short>Border Width</_short>
- <_long>Width of the border between the previews</_long>
-- <default>7</default>
-+ <default>10</default>
- <min>0</min>
- <max>30</max>
- </option>
-@@ -65,10 +65,10 @@
- <_short>Outline Color</_short>
- <_long>Outline color of the switcher window.</_long>
- <default>
-- <red>0xffff</red>
-- <green>0xffff</green>
-- <blue>0xffff</blue>
-- <alpha>0x3232</alpha>
-+ <red>0x3333</red>
-+ <green>0x3333</green>
-+ <blue>0x3333</blue>
-+ <alpha>0xd998</alpha>
- </default>
- </option>
- <subgroup>
-@@ -78,30 +78,30 @@
- <_short>Base Color</_short>
- <_long>First color for the background gradient of the switcher window.</_long>
- <default>
-- <red>0x0000</red>
-- <green>0x0000</green>
-- <blue>0x0000</blue>
-- <alpha>0x6464</alpha>
-+ <red>0xcccc</red>
-+ <green>0xcccc</green>
-+ <blue>0xe665</blue>
-+ <alpha>0xd998</alpha>
- </default>
- </option>
- <option name="background_gradient_highlight_color" type="color">
- <_short>Highlight Color</_short>
- <_long>Second color for the background gradient of the switcher window.</_long>
- <default>
-- <red>0x0000</red>
-- <green>0x0000</green>
-- <blue>0x0000</blue>
-- <alpha>0x6464</alpha>
-+ <red>0xf332</red>
-+ <green>0xf332</green>
-+ <blue>0xffff</blue>
-+ <alpha>0xd998</alpha>
- </default>
- </option>
- <option name="background_gradient_shadow_color" type="color">
- <_short>Shadow Color</_short>
- <_long>Third color for the background gradient of the switcher window.</_long>
- <default>
-- <red>0x0000</red>
-- <green>0x0000</green>
-- <blue>0x0000</blue>
-- <alpha>0x6464</alpha>
-+ <red>0xf332</red>
-+ <green>0xf332</green>
-+ <blue>0xffff</blue>
-+ <alpha>0xd998</alpha>
- </default>
- </option>
- </subgroup>
-@@ -112,20 +112,20 @@
- <_short>Base Color</_short>
- <_long>First color for the thumb gradient of the switcher window.</_long>
- <default>
-- <red>0x5555</red>
-- <green>0x5555</green>
-- <blue>0x5555</blue>
-- <alpha>0x3232</alpha>
-+ <red>0x3333</red>
-+ <green>0x3333</green>
-+ <blue>0x3333</blue>
-+ <alpha>0x5999</alpha>
- </default>
- </option>
- <option name="thumb_gradient_highlight_color" type="color">
- <_short>Highlight Color</_short>
- <_long>Second color for the thumb gradient of the switcher window.</_long>
- <default>
-- <red>0x5555</red>
-- <green>0x5555</green>
-- <blue>0x5555</blue>
-- <alpha>0x3232</alpha>
-+ <red>0x3fff</red>
-+ <green>0x3fff</green>
-+ <blue>0x3fff</blue>
-+ <alpha>0x3fff</alpha>
- </default>
- </option>
- </subgroup>
-@@ -139,7 +139,7 @@
- <red>0xffff</red>
- <green>0xffff</green>
- <blue>0xffff</blue>
-- <alpha>0xffff</alpha>
-+ <alpha>0xf332</alpha>
- </default>
- </option>
- <option name="thumb_highlight_gradient_shadow_color" type="color">
-@@ -149,7 +149,7 @@
- <red>0xdfff</red>
- <green>0xdfff</green>
- <blue>0xdfff</blue>
-- <alpha>0xffff</alpha>
-+ <alpha>0xa665</alpha>
- </default>
- </option>
- </subgroup>
-@@ -201,7 +201,7 @@
- <option name="auto_switch_vp_and_window" type="bool">
- <_short>Auto Switch Vp And Window</_short>
- <_long>Auto switch the viewport and move window when Alt-Tab to window that is more than half contained in another viewport</_long>
-- <default>false</default>
-+ <default>true</default>
- </option>
- </group>
- <group>
-@@ -356,7 +356,7 @@
- <option name="edgeflip_move" type="bool">
- <_short>Edge Flip Move</_short>
- <_long>Flip viewport when moving a window to a screen edge</_long>
-- <default>false</default>
-+ <default>true</default>
- </option>
- <option name="edgeflip_dnd" type="bool">
- <_short>Edge Flip DnD</_short>
-diff -Nur original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
---- original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2019-02-16 12:44:41.000000000 +0000
-+++ modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2019-02-17 14:11:58.782757647 +0000
-@@ -46,7 +46,7 @@
-
- namespace
- {
--unsigned int DEFAULT_VIEWPORT_WIDTH = 1;
-+unsigned int DEFAULT_VIEWPORT_WIDTH = 4;
- unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
-
- bool Advance (Display *d, bool r)
+++ /dev/null
-diff -rupN compiz/plugins/screenshot/src/screenshot.cpp compiz.new/plugins/screenshot/src/screenshot.cpp\r
---- compiz/plugins/screenshot/src/screenshot.cpp 2014-09-01 00:21:45.807271000 -0400\r
-+++ compiz.new/plugins/screenshot/src/screenshot.cpp 2014-09-01 00:52:30.634288167 -0400\r
-@@ -434,10 +434,10 @@ namespace\r
- compLogMessage ("screenshot", CompLogLevelWarn, "glReadPixels failed");\r
- }\r
- \r
-- if (!success)\r
-+ if (success)\r
- success =\r
- launchApplicationAndTakeScreenshot (alternativeApplication,\r
-- directory);\r
-+ path);\r
- \r
- return success;
\ No newline at end of file
+++ /dev/null
-pkgbase = cpu-x
- pkgdesc = A Free software that gathers information on CPU, motherboard and more
- pkgver = 4.0.1
- pkgrel = 1
- url = http://X0rg.github.io/CPU-X/
- arch = i686
- arch = x86_64
- license = GPL3
- makedepends = cmake
- makedepends = ninja
- makedepends = nasm
- depends = gtk3
- depends = ncurses
- depends = libcpuid
- depends = pciutils
- depends = procps-ng
- source = cpu-x-4.0.1.tar.gz::https://github.com/X0rg/CPU-X/archive/v4.0.1.tar.gz
- sha512sums = 44bdc21ab73eb16f54a354870cd1552dc7c98030264f21cd17d20550e83d6e446d65de9398242a2d107e9213ce66a6a1d855918447abdd9ae81c6e54d25e4243
-
-pkgname = cpu-x
-
+++ /dev/null
-*
-!.gitignore
-!.SRCINFO
-!PKGBUILD
+++ /dev/null
-# Maintainer: X0rg
-
-_realname=CPU-X
-pkgname=cpu-x
-pkgver=4.0.1
-pkgrel=1
-pkgdesc="A Free software that gathers information on CPU, motherboard and more"
-arch=('i686' 'x86_64')
-url="http://X0rg.github.io/CPU-X/"
-license=('GPL3')
-depends=('gtk3' 'ncurses' 'libcpuid' 'pciutils' 'procps-ng')
-makedepends=('cmake' 'ninja' 'nasm')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/X0rg/CPU-X/archive/v$pkgver.tar.gz")
-sha512sums=('44bdc21ab73eb16f54a354870cd1552dc7c98030264f21cd17d20550e83d6e446d65de9398242a2d107e9213ce66a6a1d855918447abdd9ae81c6e54d25e4243')
-
-build() {
- cmake -S "$_realname-$pkgver" -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" ninja -C build install
-}
+++ /dev/null
-# Maintainer: Yamada Hayao <hayao@fascode.net>
-pkgname=eg-installer
-_pkgname=EG-Installer
-pkgver=1.10
-pkgrel=1
-pkgdesc="zenityとbashで書かれた項目の追加が簡単なパッケージインストーラー"
-arch=('any')
-url=https://github.com/Hayao0819/EG-Installer
-license=('MIT')
-depends=('zenity' 'bash' 'pacman' 'eg-installer-scripts-git')
-optdepends=()
-source=("https://github.com/Hayao0819/EG-Installer/archive/v${pkgver}.tar.gz" "config")
-md5sums=('SKIP' 'SKIP')
-conflicts=('eg-installer-git')
-
-package() {
- mkdir -p "${pkgdir}/etc/eg-installer/"
- cp "${srcdir}/config" "${pkgdir}/etc/eg-installer/"
- cp "${srcdir}/${_pkgname}-${pkgver}/pacapt" "${pkgdir}/etc/eg-installer/"
- # cp -r "${srcdir}/${_pkgname}-${pkgver}/softwares/" "${pkgdir}/etc/eg-installer/"
-
- mkdir -p "${pkgdir}/usr/bin/"
- cp "${srcdir}/${_pkgname}-${pkgver}/eg-installer" "${pkgdir}/usr/bin/"
-}
-
+++ /dev/null
-#!/usr/bin/env bash
-
-#=================================================================#
-# EG-Installer config
-#=================================================================#
-
-
-
-#=================================================================#
-# 一部の値はデバッグ用引数で上書きできます。
-# 詳しくは-hオプションをつけてeg-installerを実行してください。
-#=================================================================#
-
-
-
-#-- ウィンドウのタイトル --#
-window_text="EG-Installer v.${version}"
-
-
-
-#-- ウィンドウのアイコン --#
-#
-#=================================================================#
-# svgもしくはpngが使用できます。必ずフルパスで記述してください。
-# このアイコンはウィンドウマネージャのアイコン表示に使用されます。
-#=================================================================#
-#
-window_icon="/usr/share/pixmaps/archlinux.png"
-
-
-
-#-- pacaptのパス --#
-#
-#=================================================================#
-# ArchLinuxでは、この設定は無視され、自動的に/usr/bin/pacmanに設定されます。
-# それ以外ではpacaptが存在しないとエラーになります。
-#=================================================================#
-#
-pacman="/etc/eg-installer/pacapt"
-
-
-
-#-- スクリプトディレクトリ --#
-#
-#=================================================================#
-# 各ソフトウェアのインストール情報などが書かれたスクリプトが入っているディレクトリです。
-# ディレクトリ内にはパッケージのスクリプト以外はいれないでください（正常に実行できません）
-# スクリプトと同じディレクトリを指定する場合は${current_dir}が使用できます。
-#=================================================================#
-#
-script_dir="/etc/eg-installer/softwares"
-
-
-
-#-- インストールされているパッケージ一覧 --#
-#
-#=================================================================#
-# ディストリビューションに依存するため、設定で定義します。
-# 対応させたいディストリビューションで、「pacapt -Q」を実行して
-# インストールされているパッケージのみを出力するようにしてください。
-# バージョン情報などが表示される場合は、awkやgrepなどを使用して出力から除外してください。
-# ディストリビューターはかならずこの値を変更してください
-#
-# pacaptへのパスとして${pacman}を使用してください。
-# (${pacman}は上記の「pacaptのパス」に設定された値になります。)
-#=================================================================#
-#
-# pacman用（-p）
-# installed_list () { pacman -Q | awk '{print $1}'; }
-#
-# apt,dpkg用 （-d）
-# installed_list () { ${pacman} -Q | awk '{print $2}'; }
-
-installed_list () { pacman -Q | awk '{print $1}'; }
-
-
-
-#-- softwaresアップデートスクリプト --#
-#
-#=================================================================#
-# softwaresの中身を更新するスクリプトです。
-# スクリプトはすべてディストリビューターが用意する必要があります。
-# デフォルトではこの項目は空です。この変数を設定するのは全て自己責任でお願いします。
-# この変数で設定したスクリプトは「ソフトウェアの追加と削除」を選択した際に、softwaresの一覧を読み込む前に実行されます。
-# 例えば、SereneLinuxでは最新のsoftwaresを公式サイトの「serenelinux.com/redirect/softwares/bionic」に置き、
-# この変数で一覧を読み込む前に自動でダウンロード、展開を行うようにしています。
-#=================================================================#
-#
-# softwares_update=
-
-
-
-#-- オプションを固定 --#
-#
-#=================================================================#
-# オプションを固定します。
-# ここで設定された値は通常の引数より優先されます。
-# 使用できるオプションは-hオプションで確認してください。
-#=================================================================#
-# fixed_option=
\ No newline at end of file
+++ /dev/null
-pkgbase = gconf
- pkgdesc = An obsolete configuration database system
- pkgver = 3.2.6+11+g07808097
- pkgrel = 9
- url = https://projects-old.gnome.org/gconf/
- install = gconf.install
- arch = x86_64
- license = LGPL
- makedepends = intltool
- makedepends = gtk-doc
- makedepends = gobject-introspection
- makedepends = git
- makedepends = gnome-common
- depends = libxml2
- depends = polkit
- depends = libldap
- depends = dbus-glib
- depends = python
- source = git+https://gitlab.gnome.org/Archive/gconf.git#commit=0780809731c8ab1c364202b1900d3df106b28626
- source = 01_xml-gettext-domain.patch
- source = gconf-reload.patch
- source = gconf-merge-schema
- source = gconfpkg
- source = gconf-install.hook
- source = gconf-remove.hook
- sha256sums = SKIP
- sha256sums = c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8
- sha256sums = 567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694
- sha256sums = ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028
- sha256sums = bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898
- sha256sums = 2732b2a6b187c5620105a036bde12edee99669605f70cbde56fe5f39619c3dc0
- sha256sums = 436a65ff290095bc3d35d7d6297cf4d647f61e9f9922cea7ef9f1e251b447ff7
-
-pkgname = gconf
-
+++ /dev/null
-# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
-# Ubuntu: https://bugs.launchpad.net/bugs/123025
-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
---- GConf-2.26.0/backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400
-+++ GConf-2.26.0/backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400
-@@ -52,6 +52,7 @@ struct _MarkupEntry
- char *schema_name;
- char *mod_user;
- GTime mod_time;
-+ const char *gettext_domain;
- };
-
- static LocalSchemaInfo* local_schema_info_new (void);
-@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry
- gconf_schema_get_type (schema));
- gconf_schema_set_owner (current_schema,
- gconf_schema_get_owner (schema));
-+ gconf_schema_set_gettext_domain (current_schema,
-+ gconf_schema_get_gettext_domain (schema));
- }
-
- /* Update mod time */
-@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
- else if (c_local_schema && c_local_schema->long_desc)
- gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
-
-+ gconf_schema_set_gettext_domain (schema, entry->gettext_domain);
-+
- return retval;
- }
- }
-@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext
- const char *ltype;
- const char *list_type;
- const char *owner;
-+
- GConfValueType vtype;
-- const char *dummy1, *dummy2, *dummy3, *dummy4;
-+ const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
-
- #if 0
- g_assert (ELEMENT_IS ("entry") ||
-@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext
- "muser", &dummy2,
- "mtime", &dummy3,
- "schema", &dummy4,
-+ "gettext_domain", &dummy5,
-
- NULL))
- return;
-@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
- const char *mtime;
- const char *schema;
- const char *type;
-+ const char *gettext_domain;
- const char *dummy1, *dummy2, *dummy3, *dummy4;
- const char *dummy5, *dummy6, *dummy7;
- GConfValue *value;
-@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext
- mtime = NULL;
- schema = NULL;
- type = NULL;
-+ gettext_domain = NULL;
-
- if (!locate_attributes (context, element_name, attribute_names, attribute_values,
- error,
-@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
- "mtime", &mtime,
- "schema", &schema,
- "type", &type,
-+ "gettext_domain", &gettext_domain,
-
- /* These are allowed but we don't use them until
- * parse_value_element
-@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext
- */
- if (schema)
- entry->schema_name = g_strdup (schema);
-+
-+ if (gettext_domain)
-+ entry->gettext_domain = g_intern_string (gettext_domain);
- }
- else
- {
-@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
- GConfSchema *schema;
- GConfValueType stype;
- const char *owner;
-+ const char *gettext_domain;
-
- schema = gconf_value_get_schema (value);
-
-@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
-
- g_free (s);
- }
-+
-+ gettext_domain = gconf_schema_get_gettext_domain (schema);
-+
-+ if (gettext_domain)
-+ {
-+ char *s;
-+
-+ s = g_markup_escape_text (gettext_domain, -1);
-+
-+ if (fprintf (f, " gettext_domain=\"%s\"", s) < 0)
-+ {
-+ g_free (s);
-+ return FALSE;
-+ }
-+
-+ g_free (s);
-+ }
-
- if (stype == GCONF_VALUE_LIST)
- {
-diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
---- GConf-2.26.0/doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400
-+++ GConf-2.26.0/doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400
-@@ -7,7 +7,7 @@
- <!-- A single schema. What I am trying to say is "this set of
- elements, in any order". Duplicate elements (apart from <locale>) are
- not allowed). -->
--<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*>
-+<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*>
-
- <!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
- <!ELEMENT key (#PCDATA)>
-diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
---- GConf-2.26.0/gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400
-+++ GConf-2.26.0/gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400
-@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
- cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
- cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
- cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
-+ cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : "");
-
- {
- gchar* encoded;
-@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con
- gconf_schema_set_owner(sc, cs->owner);
- }
-
-+ if (*cs->gettext_domain != '\0')
-+ {
-+ if (!g_utf8_validate (cs->gettext_domain, -1, NULL))
-+ gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema"));
-+ else
-+ gconf_schema_set_gettext_domain(sc, cs->gettext_domain);
-+ }
-+
- {
- GConfValue* val;
-
-diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
---- GConf-2.26.0/gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400
-@@ -32,9 +32,10 @@ typedef struct {
- GConfValueType car_type; /* Pair car type of the described entry */
- GConfValueType cdr_type; /* Pair cdr type of the described entry */
- gchar* locale; /* Schema locale */
-- gchar* owner; /* Name of creating application */
-+ const gchar* owner; /* Name of creating application */
- gchar* short_desc; /* 40 char or less description, no newlines */
- gchar* long_desc; /* could be a paragraph or so */
-+ const gchar* gettext_domain; /* description gettext domain */
- GConfValue* default_value; /* Default value of the key */
- } GConfRealSchema;
-
-@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc)
- g_free (real->locale);
- g_free (real->short_desc);
- g_free (real->long_desc);
-- g_free (real->owner);
-
- if (real->default_value)
- gconf_value_free (real->default_value);
-@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc
-
- dest->long_desc = g_strdup (real->long_desc);
-
-- dest->owner = g_strdup (real->owner);
-+ dest->gettext_domain = real->gettext_domain;
-+
-+ dest->owner = real->owner;
-
- dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
-
-@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc
- REAL_SCHEMA (sc)->locale = NULL;
- }
-
-+void
-+gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain)
-+{
-+ g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL));
-+
-+ if (domain)
-+ REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain);
-+ else
-+ REAL_SCHEMA (sc)->gettext_domain = NULL;
-+}
-+
- void
- gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
- {
-@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc,
- {
- g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
-
-- if (REAL_SCHEMA (sc)->owner)
-- g_free (REAL_SCHEMA (sc)->owner);
--
- if (owner)
-- REAL_SCHEMA (sc)->owner = g_strdup (owner);
-+ REAL_SCHEMA (sc)->owner = g_intern_string (owner);
- else
- REAL_SCHEMA (sc)->owner = NULL;
- }
-@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema
- return FALSE;
- }
-
-+ if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL))
-+ {
-+ g_set_error (err, GCONF_ERROR,
-+ GCONF_ERROR_FAILED,
-+ _("Schema contains invalid UTF-8"));
-+ return FALSE;
-+ }
-+
- if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
- {
- g_set_error (err, GCONF_ERROR,
-@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche
- }
-
- const char*
-+gconf_schema_get_gettext_domain (const GConfSchema *schema)
-+{
-+ g_return_val_if_fail (schema != NULL, NULL);
-+
-+ return REAL_SCHEMA (schema)->gettext_domain;
-+}
-+
-+static inline const char *
-+schema_translate (const GConfSchema *schema,
-+ const char *string)
-+{
-+ if (REAL_SCHEMA (schema)->gettext_domain)
-+ {
-+ bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8");
-+ return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string);
-+ }
-+ else
-+ return string;
-+}
-+
-+const char*
- gconf_schema_get_short_desc (const GConfSchema *schema)
- {
- g_return_val_if_fail (schema != NULL, NULL);
-
-- return REAL_SCHEMA (schema)->short_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc);
- }
-
- const char*
-@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS
- {
- g_return_val_if_fail (schema != NULL, NULL);
-
-- return REAL_SCHEMA (schema)->long_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc);
- }
-
- const char*
-diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
---- GConf-2.26.0/gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400
-@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type
- GConfValueType type);
- void gconf_schema_set_locale (GConfSchema *sc,
- const gchar *locale);
-+void gconf_schema_set_gettext_domain (GConfSchema *sc,
-+ const gchar *domain);
- void gconf_schema_set_short_desc (GConfSchema *sc,
- const gchar *desc);
- void gconf_schema_set_long_desc (GConfSchema *sc,
-@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ
- GConfValueType gconf_schema_get_car_type (const GConfSchema *schema);
- GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema);
- const char* gconf_schema_get_locale (const GConfSchema *schema);
-+const char* gconf_schema_get_gettext_domain(const GConfSchema *schema);
- const char* gconf_schema_get_short_desc (const GConfSchema *schema);
- const char* gconf_schema_get_long_desc (const GConfSchema *schema);
- const char* gconf_schema_get_owner (const GConfSchema *schema);
-diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
---- GConf-2.26.0/gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400
-+++ GConf-2.26.0/gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400
-@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
- GConfValueType cdr_type;
- GConfValue* global_default;
- GHashTable* hash;
-+ gchar* gettext_domain;
- };
-
- static int
-@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
- else
- g_printerr (_("WARNING: empty <applyto> node"));
- }
-+ else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+ {
-+ tmp = (char *)xmlNodeGetContent(iter);
-+ if (tmp)
-+ {
-+ info->gettext_domain = g_strdup(tmp);
-+ xmlFree(tmp);
-+ }
-+ }
- else
- g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
- iter->name);
-@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch
- if (info->owner != NULL)
- gconf_schema_set_owner(schema, info->owner);
-
-+ if (info->gettext_domain != NULL)
-+ gconf_schema_set_gettext_domain(schema, info->gettext_domain);
-+
- xmlFree(name);
-
- /* Locale-specific info */
-@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch
- info.apply_to = NULL;
- info.owner = NULL;
- info.global_default = NULL;
-+ info.gettext_domain = NULL;
- info.hash = g_hash_table_new(g_str_hash, g_str_equal);
-
- extract_global_info(node, &info);
-@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch
- ; /* nothing */
- else if (strcmp((char *)iter->name, "applyto") == 0)
- ; /* nothing */
-+ else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+ ; /* nothing */
- else if (strcmp((char *)iter->name, "locale") == 0)
- {
- process_locale_info(iter, &info);
-diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
---- GConf-2.26.0/gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400
-+++ GConf-2.26.0/gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400
-@@ -16,6 +16,7 @@ struct ConfigSchema {
- string short_desc;
- string long_desc;
- string owner;
-+ string gettext_domain;
- // Work around lack of recursive data types
- string encoded_default_value;
- };
+++ /dev/null
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
-# Contributor: Jan de Groot <jan@archlinux.org>
-
-pkgname=gconf
-pkgver=3.2.6+11+g07808097
-pkgrel=9
-pkgdesc="An obsolete configuration database system"
-url="https://projects-old.gnome.org/gconf/"
-arch=(x86_64)
-license=(LGPL)
-depends=(libxml2 polkit libldap dbus-glib python)
-makedepends=(intltool gtk-doc gobject-introspection git gnome-common)
-install=gconf.install
-_commit=0780809731c8ab1c364202b1900d3df106b28626 # The latest and last commit, dug out from deep within the waves of time...
-source=("git+https://gitlab.gnome.org/Archive/gconf.git#commit=$_commit"
- 01_xml-gettext-domain.patch gconf-reload.patch
- gconf-merge-schema gconfpkg gconf-{install,remove}.hook)
-sha256sums=('SKIP'
- 'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8'
- '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
- 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
- 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
- '2732b2a6b187c5620105a036bde12edee99669605f70cbde56fe5f39619c3dc0'
- '436a65ff290095bc3d35d7d6297cf4d647f61e9f9922cea7ef9f1e251b447ff7')
-
-prepare() {
- cd $pkgname
-
- # Patch from fedora - reloads gconf after installing schemas
- patch -Np1 -i ../gconf-reload.patch
-
- # http://bugzilla.gnome.org/show_bug.cgi?id=568845
- patch -Np1 -i ../01_xml-gettext-domain.patch
-
- # The following line copied from Fedora
- # https://src.fedoraproject.org/rpms/GConf2/blob/70ed26d67b563d858a84505622d11f41879a6b37/f/GConf2.spec#_90
- 2to3 --write --nobackup gsettings/gsettings-schema-convert
-
- sed -i '1s|#!/usr/bin/env python$|#!/usr/bin/python|' gsettings/gsettings-schema-convert
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --enable-defaults-service \
- --disable-gtk-doc \
- --disable-static \
- --disable-orbit
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- cd $pkgname
- make check
-}
-
-package() {
- DESTDIR="$pkgdir" make -C $pkgname install
-
- install -d "$pkgdir/etc/gconf/gconf.xml.system"
- install -Dt "$pkgdir/usr/bin" gconf-merge-schema gconfpkg
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ./*.hook
-
- # fix dbus policy location - --with-dbusdir doens't work
- install -dm755 "$pkgdir/usr/share/dbus-1/system.d"
- mv "$pkgdir"/etc/dbus-1/system.d/* "$pkgdir/usr/share/dbus-1/system.d"
- rm -rf "$pkgdir/etc/dbus-1"
-}
+++ /dev/null
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/share/gconf/schemas/*.schemas
-
-[Action]
-Description = Installing GConf schemas...
-When = PostTransaction
-Exec = /bin/bash -c 'while read -r f; do f=$(basename "$f" .schemas); /usr/bin/gconfpkg --install $f; done'
-NeedsTargets
+++ /dev/null
-#!/bin/bash
-if [ ! "$1" -a ! "$2" ]; then
- echo "Usage: $0 output.schemas [--domain gettextdomain] file1.schemas [file2.schemas [...]]"
- exit 1
-fi
-
-OUTFILE="$1"
-DOMAIN=""
-shift
-
-if [ "$1" = "--domain" ]; then
- shift
- DOMAIN=$1
- shift
-fi
-
-echo '<?xml version="1.0"?>' > "$OUTFILE"
-echo '<gconfschemafile><schemalist>' >> "$OUTFILE"
-
-while [ "$1" ]; do
- if [ -f "$1" ]; then
- sed -e '/<?xml/d' \
- -e 's|<gconfschemafile>||g' \
- -e 's|</gconfschemafile>||g' \
- -e 's|<schemalist>||g' \
- -e 's|</schemalist>||g' "$1" >> "$OUTFILE"
- fi
- shift
-done
-
-echo '</schemalist></gconfschemafile>' >> "$OUTFILE"
-if [ "$DOMAIN" != "" ]; then
- sed -ri "s/^([[:space:]]*)(<locale name=\"C\">)/\1<gettext_domain>$DOMAIN<\/gettext_domain>\n\1\2/; /^[[:space:]]*<locale name=\"[^C]/,/^[[:space:]]*<\/locale>[[:space:]]*\$/ d; /^$/d; s/<\/schema>$/&\n/" "$OUTFILE"
-fi
+++ /dev/null
---- GConf-2.16.0/gconf/gconftool.c.orig 2006-10-14 17:37:14.000000000 +0000
-+++ GConf-2.16.0/gconf/gconftool.c 2006-10-14 17:39:27.000000000 +0000
-@@ -963,6 +963,8 @@ main (int argc, char** argv)
-
- gconf_engine_unref (conf);
-
-+ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
- return retval;
- }
-
-@@ -975,6 +977,8 @@ main (int argc, char** argv)
-
- gconf_engine_unref (conf);
-
-+ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
- return retval;
- }
-
+++ /dev/null
-[Trigger]
-Type = File
-Operation = Remove
-Target = usr/share/gconf/schemas/*.schemas
-
-[Action]
-Description = Uninstalling GConf schemas...
-When = PreTransaction
-Exec = /bin/bash -c 'while read -r f; do f=$(basename "$f" .schemas); /usr/bin/gconfpkg --uninstall $f; done'
-NeedsTargets
+++ /dev/null
-post_upgrade() {
- pkill -fx /usr/lib/gconfd-2 || :
-}
+++ /dev/null
-#!/bin/sh
-
-usage() {
-cat << _EOF
-Usage:
- gconfpkg [OPTION] [PACKAGE]
-
- Help Options:
- -?, --help Show help options
-
- Application Options:
- --install Install schemas for a given package
- --uninstall Uninstall schemas for a given package
-
-_EOF
-}
-
-install() {
- GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
- /usr/bin/gconftool-2 --makefile-install-rule /usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-}
-
-uninstall() {
- if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
- schemas=/usr/share/gconf/schemas/${pkgname}.schemas
- elif [ -f /opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
- schemas=/opt/gnome/share/gconf/schemas/${pkgname}.schemas
- else
- schemas=`pacman -Ql ${pkgname} | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`
- fi
- GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
- /usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null
-}
-
-if [ -z "$2" ]; then
- usage
-else
- pkgname="$2"
- case "$1" in
- --install)
- install
- ;;
- --uninstall)
- uninstall
- ;;
- *)
- usage
- ;;
- esac
-fi
+++ /dev/null
-pkgbase = gnome-shell-extension-dash-to-dock
- pkgdesc = Move the dash out of the overview transforming it in a dock
- pkgver = 69
- pkgrel = 1
- url = https://micheleg.github.io/dash-to-dock/
- arch = any
- license = GPL
- makedepends = intltool
- makedepends = gettext
- makedepends = git
- depends = gnome-shell
- source = git+https://github.com/micheleg/dash-to-dock.git#commit=71abe800b2bc0bca60c63c8e646db2a8a9827ddf
- sha256sums = SKIP
-
-pkgname = gnome-shell-extension-dash-to-dock
-
+++ /dev/null
-# Maintainer: drakkan <nicola dot murino at gmail dot com>
-# Contributor: XZS <d dot f dot fischer at web dot de>
-# Contributor: Carl George < arch at cgtx dot us >
-# Contributor: Janne Haapsaari <haaja@iki.fi>
-# Contributor: Christopher Krooß <didi2002 at web.de>
-
-pkgname=gnome-shell-extension-dash-to-dock
-_pkgname=dash-to-dock
-pkgver=69
-pkgrel=1
-pkgdesc="Move the dash out of the overview transforming it in a dock"
-arch=('any')
-url="https://micheleg.github.io/dash-to-dock/"
-license=('GPL')
-depends=('gnome-shell')
-makedepends=('intltool' 'gettext' 'git')
-_commit=71abe800b2bc0bca60c63c8e646db2a8a9827ddf
-source=("git+https://github.com/micheleg/dash-to-dock.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
- cd "${srcdir}"/${_pkgname}
- git describe --tags | sed 's/^extensions\.gnome\.org-v//g' | sed 's/-/+/g'
-}
-
-build() {
- cd "${srcdir}"/${_pkgname}
- make
-}
-
-package() {
- cd "${srcdir}"/${_pkgname}
- make DESTDIR="${pkgdir}" VERSION="${pkgver}" install
-}
-
-# vim:set ts=2 sw=2 et:
+++ /dev/null
-# Generated by mksrcinfo v8
-# Wed Oct 12 15:29:52 UTC 2016
-pkgbase = gnome-shell-extension-extensions-git
- pkgdesc = Extensions which allows to enable and disable extensions via a menu in the status area in the main menu panel.
- pkgver = r21.e64f753
- pkgrel = 1
- url = https://github.com/petres/gnome-shell-extension-extensions
- arch = any
- license = GPL3
- makedepends = git
- depends = gnome-shell
- source = git+https://github.com/petres/gnome-shell-extension-extensions
- md5sums = SKIP
-
-pkgname = gnome-shell-extension-extensions-git
-
+++ /dev/null
-# Maintainer: Peter Reschenhofer <peter.reschenhofer@gmail.com>
-pkgname=gnome-shell-extension-extensions-git
-_pkgname=${pkgname%-git}
-
-pkgver=r21.e64f753
-pkgrel=1
-pkgdesc="Extensions which allows to enable and disable extensions via a menu in the status area in the main menu panel."
-arch=('any')
-url="https://github.com/petres/gnome-shell-extension-extensions"
-license=('GPL3')
-depends=('gnome-shell')
-makedepends=('git')
-source=("git+https://github.com/petres/gnome-shell-extension-extensions")
-_gitfolder="extensions@abteil.org"
-md5sums=('SKIP')
-
-pkgver() {
- cd "$srcdir/$_pkgname"
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-package() {
- cd "$srcdir/$_pkgname"
- mkdir -p "$pkgdir/usr/share/gnome-shell/extensions"
- cp -r "$_gitfolder" "$pkgdir/usr/share/gnome-shell/extensions/"
-}
+++ /dev/null
-pkgbase = gnome-shell-extension-topicons-redux
- pkgdesc = TopIcons Redux is a fork of TopIcons Plus
- pkgver = 6
- pkgrel = 1
- url = https://gitlab.com/pop-planet/TopIcons-Redux
- arch = any
- groups = gnome-shell-extensions
- license = GPL
- makedepends = git
- depends = gnome-shell
- provides = gnome-shell-extension-topicons-redux
- source = git+https://gitlab.com/pop-planet/TopIcons-Redux.git#tag=6
- sha256sums = SKIP
-
-pkgname = gnome-shell-extension-topicons-redux
-
+++ /dev/null
-# Maintainer: Leonidas spyropoulos <artafinde AT gmail DOT com>
-
-pkgname=gnome-shell-extension-topicons-redux
-_projectName=TopIcons-Redux
-pkgver=6
-pkgrel=1
-pkgdesc='TopIcons Redux is a fork of TopIcons Plus'
-arch=('any')
-url="https://gitlab.com/pop-planet/${_projectName}"
-license=('GPL')
-depends=('gnome-shell')
-makedepends=('git')
-provides=('gnome-shell-extension-topicons-redux')
-groups=('gnome-shell-extensions')
-source=("git+https://gitlab.com/pop-planet/${_projectName}.git#tag=${pkgver}")
-sha256sums=('SKIP')
-
-build() {
- cd "${_projectName}"
- make build
-}
-
-package() {
- cd "${_projectName}"
- local uuid=$(grep -Po '(?<="uuid": ")[^"]*' _build/metadata.json)
- local destdir="$pkgdir/usr/share/gnome-shell/extensions/$uuid"
- install -dm755 "$destdir"
- cp -r _build/* "$destdir"
-}
+++ /dev/null
-pkgbase = ice-ssb
- pkgdesc = A simple Site Specific Browser for Firefox, Chromium and Google Chrome from "Peppermint OS" Project
- pkgver = 6.0.8
- pkgrel = 1
- url = https://github.com/peppermintos/ice
- arch = any
- license = GPL2
- depends = python-requests
- depends = python-beautifulsoup4
- depends = python-gobject
- depends = python-lxml
- optdepends = firefox: Browser to use
- optdepends = chromium: Browser to use
- optdepends = google-chrome: Browser to use
- optdepends = vivaldi: Browser to use
- source = ice-6.0.8.tar.gz::https://github.com/peppermintos/ice/archive/v6.0.8.tar.gz
- md5sums = 144ca45c6ee5072dcbb14a2da0955db3
-
-pkgname = ice-ssb
-
+++ /dev/null
-#Maintainer: Ivan Marquesi Lerner <ivanml1992 @!@ gmail.com>
-#Contributor: Benedikt Tissot <benedikt.tissot@googlemail.com>
-#Contributor: Alex Gajewski <apagajewski@gmail.com>
-
-_pkgname=ice
-pkgname=ice-ssb
-pkgver=6.0.8
-pkgrel=1
-pkgdesc='A simple Site Specific Browser for Firefox, Chromium and Google Chrome from "Peppermint OS" Project'
-url='https://github.com/peppermintos/ice'
-arch=(any)
-license=(GPL2)
-depends=("python-requests" "python-beautifulsoup4" "python-gobject" "python-lxml")
-source=("$_pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-md5sums=('144ca45c6ee5072dcbb14a2da0955db3')
-optdepends=("firefox: Browser to use" "chromium: Browser to use" "google-chrome: Browser to use" "vivaldi: Browser to use")
-
-package() {
- cp -r -f "${srcdir}/$_pkgname-$pkgver/usr" "${pkgdir}/usr"
- # symlinks to use chromium and google-chrome, change this if you use other versions
- # chromium
- ln -s /usr/bin/chromium "${pkgdir}/usr/bin/chromium-browser"
- # google-chrome
- ln -s /usr/bin/google-chrome-stable "${pkgdir}/usr/bin/google-chrome"
-}
+++ /dev/null
-pkgbase = inverse-icon-theme-blue-git
- pkgdesc = A colorful Design icon theme for linux desktops
- pkgver = r29.f47fcf7
- pkgrel = 1
- url = https://github.com/yeyushengfan258/Inverse-icon-theme
- arch = any
- license = GPL
- depends = gtk-update-icon-cache
- conflicts = inverse-icon-theme-blue
- source = git+https://github.com/yeyushengfan258/Inverse-icon-theme.git
- md5sums = SKIP
-
-pkgname = inverse-icon-theme-blue-git
-
+++ /dev/null
-# Maintainer: Yamada Hayao <hayao@fascode.net>
-
-pkgname=inverse-icon-theme-blue-git
-_pkgname=inverse-icon-theme
-_gitname=Inverse-icon-theme
-pkgver=r29.f47fcf7
-pkgrel=1
-pkgdesc="A colorful Design icon theme for linux desktops"
-arch=('any')
-url='https://github.com/yeyushengfan258/Inverse-icon-theme'
-license=('GPL')
-depends=('gtk-update-icon-cache')
-optdepends=()
-source=("git+${url}.git")
-md5sums=('SKIP')
-conflicts=('inverse-icon-theme-blue')
-
-pkgver() {
- cd "${_gitname}"
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-package() {
- mkdir -p "${pkgdir}"
- cp -r * "${pkgdir}"
- cd "${pkgdir}"
- mkdir -p "${pkgdir}/usr/share/icons"
- ${_gitname}/install.sh -blue -d "${pkgdir}/usr/share/icons"
- rm -rf "${pkgdir}/${_gitname}"
-}
+++ /dev/null
-pkgbase = ipad_charge
- pkgdesc = iPad USB charging control utility
- pkgver = 1.1
- pkgrel = 4
- url = http://www.rainbow-software.org/linux/
- arch = i686
- arch = x86_64
- license = GPL2
- makedepends = gcc
- depends = udev
- depends = libusb
- source = http://www.rainbow-software.org/linux_files/ipad_charge_1.1.tar.gz
- source = 95-ipad_charge.rules.patch
- source = ipad_charge.c.patch
- md5sums = 09b8c600efd747a36c9cc320516326cf
- md5sums = bfc9325716cc8fcedc04f13fcf7c8693
- md5sums = 45d28ae05281b4fa0739d858fc01d324
-
-pkgname = ipad_charge
-
+++ /dev/null
-diff -Naur orig/95-ipad_charge.rules src/95-ipad_charge.rules
---- orig/95-ipad_charge.rules 2011-05-10 22:57:11.000000000 +0300
-+++ src/95-ipad_charge.rules 2011-07-05 00:33:47.797987569 +0300
-@@ -1,2 +1,4 @@
- ENV{DEVTYPE}=="usb_device", ACTION=="add", BUS=="usb", SYSFS{idVendor}=="05ac", SYSFS{idProduct}=="129a", RUN+="/usr/bin/ipad_charge"
- ENV{DEVTYPE}=="usb_device", ACTION=="add", BUS=="usb", SYSFS{idVendor}=="05ac", SYSFS{idProduct}=="129f", RUN+="/usr/bin/ipad_charge"
-+ENV{DEVTYPE}=="usb_device", ACTION=="add", BUS=="usb", SYSFS{idVendor}=="05ac", SYSFS{idProduct}=="12a2", RUN+="/usr/bin/ipad_charge"
-+ENV{DEVTYPE}=="usb_device", ACTION=="add", BUS=="usb", SYSFS{idVendor}=="05ac", SYSFS{idProduct}=="12a4", RUN+="/usr/bin/ipad_charge"
+++ /dev/null
-# Maintainer: zlowly <zlowly AT gmail DOT com>
-pkgname=ipad_charge
-pkgver=1.1
-pkgrel=4
-pkgdesc="iPad USB charging control utility"
-arch=("i686" "x86_64")
-url="http://www.rainbow-software.org/linux/"
-license=('GPL2')
-source=("http://www.rainbow-software.org/linux_files/${pkgname}_${pkgver}.tar.gz"
-"95-ipad_charge.rules.patch"
-"ipad_charge.c.patch"
-)
-depends=('udev' 'libusb')
-makedepends=('gcc')
-md5sums=('09b8c600efd747a36c9cc320516326cf'
- 'bfc9325716cc8fcedc04f13fcf7c8693'
- '45d28ae05281b4fa0739d858fc01d324')
-build() {
- cd $srcdir/${pkgname}-${pkgver}
- patch -p1 -i ${srcdir}/95-ipad_charge.rules.patch
- sed -i -e "s/SYSFS/ATTRS/g" -e "s/BUS/SUBSYSTEMS/g" 95-ipad_charge.rules
- patch -p1 -i ${srcdir}/ipad_charge.c.patch
- gcc -Wall -Wextra ipad_charge.c -lusb-1.0 -o ipad_charge
-}
-package() {
- mkdir -p $pkgdir/usr/bin
- mkdir -p $pkgdir/etc/udev/rules.d
- cd $srcdir/${pkgname}-${pkgver}
- install -m755 -s ipad_charge $pkgdir/usr/bin/
- install -m644 95-ipad_charge.rules $pkgdir/etc/udev/rules.d/
-}
-
-# vim:set ts=2 sw=2 et:
+++ /dev/null
-diff -Naur orig/ipad_charge.c src/ipad_charge.c
---- orig/ipad_charge.c 2011-05-10 22:59:12.000000000 +0300
-+++ src/ipad_charge.c 2011-07-05 00:32:16.494656512 +0300
-@@ -12,6 +12,7 @@
- #define VENDOR_APPLE 0x05ac
- #define PRODUCT_IPAD 0x129a
- #define PRODUCT_IPAD2 0x129f
-+#define PRODUCT_IPAD2_3G 0x12a2
-
- int set_charging_mode(libusb_device *dev, bool enable) {
- int ret;
-@@ -130,7 +131,9 @@
- continue;
- }
- if (desc.idVendor == VENDOR_APPLE &&
-- (desc.idProduct == PRODUCT_IPAD || desc.idProduct == PRODUCT_IPAD2)) {
-+ (desc.idProduct == PRODUCT_IPAD ||
-+ desc.idProduct == PRODUCT_IPAD2 ||
-+ desc.idProduct == PRODUCT_IPAD2_3G)) {
- if (set_charging_mode(dev, enable) < 0)
- fprintf(stderr, "ipad_charge: error setting charge mode\n");
- else
+++ /dev/null
-pkgbase = libcpuid
- pkgdesc = A small C library for x86 CPU detection and feature extraction
- pkgver = 0.5.0
- pkgrel = 1
- url = http://libcpuid.sourceforge.net
- arch = i686
- arch = x86_64
- license = BSD
- makedepends = git
- makedepends = cmake
- makedepends = ninja
- makedepends = doxygen
- depends = glibc
- source = libcpuid-0.5.0.tar.gz::https://github.com/anrieff/libcpuid/archive/v0.5.0.tar.gz
- sha512sums = c98f4a95e111da5a4ac54d6f6e25c882f01e6984fcf2f8c1d1c8437cac54ea057233aab05a19c4a1ffa800d54aebf089ca8be6b26b89ff625df382a2984ee462
-
-pkgname = libcpuid
-
+++ /dev/null
-*
-!.gitignore
-!.SRCINFO
-!PKGBUILD
+++ /dev/null
-# Maintainer: X0rg
-
-pkgname=libcpuid
-pkgver=0.5.0
-pkgrel=1
-pkgdesc="A small C library for x86 CPU detection and feature extraction"
-arch=('i686' 'x86_64')
-url="http://libcpuid.sourceforge.net"
-license=('BSD')
-depends=('glibc')
-makedepends=('git' 'cmake' 'ninja' 'doxygen')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/anrieff/libcpuid/archive/v$pkgver.tar.gz")
-sha512sums=('c98f4a95e111da5a4ac54d6f6e25c882f01e6984fcf2f8c1d1c8437cac54ea057233aab05a19c4a1ffa800d54aebf089ca8be6b26b89ff625df382a2984ee462')
-
-build() {
- cmake -S "$srcdir/$pkgname-$pkgver" -B build -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
- install -Dvm644 "$srcdir/$pkgname-$pkgver/COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
+++ /dev/null
-pkgbase = mugshot
- pkgdesc = Program to update personal user details
- pkgver = 0.4.2
- pkgrel = 1
- url = https://github.com/bluesabre/mugshot
- arch = any
- license = GPLv3
- makedepends = python-distutils-extra
- makedepends = intltool
- depends = gtk3
- depends = python-pexpect
- depends = python-dbus
- depends = python-cairo
- depends = python-gobject
- depends = accountsservice
- optdepends = cheese: webcam support
- optdepends = pidgin: update buddy icon
- optdepends = libreoffice: update user details
- options = !emptydirs
- source = mugshot-0.4.2.tar.gz::https://github.com/bluesabre/mugshot/archive/mugshot-0.4.2.tar.gz
- sha256sums = 05698a36494405b5a76be0bf92e89a87fec4e3e6e6168378833de160c9741c84
-
-pkgname = mugshot
-
+++ /dev/null
-# Maintainer: twa022 <twa022 at gmail dot com>
-# Contributor: Somasis <somasis@cryptolab.net>
-
-pkgname=mugshot
-pkgver=0.4.2
-pkgrel=1
-pkgdesc="Program to update personal user details"
-arch=('any')
-url="https://github.com/bluesabre/mugshot"
-license=('GPLv3')
-depends=('gtk3' 'python-pexpect' 'python-dbus' 'python-cairo' 'python-gobject' 'accountsservice')
-makedepends=('python-distutils-extra' 'intltool')
-optdepends=('cheese: webcam support'
- 'pidgin: update buddy icon'
- 'libreoffice: update user details')
-options=(!emptydirs)
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('05698a36494405b5a76be0bf92e89a87fec4e3e6e6168378833de160c9741c84')
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
- python setup.py install --root "${pkgdir}" --optimize=1
-}
+++ /dev/null
-pkgbase = pamac-aur
- pkgdesc = A Gtk3 frontend for libalpm
- pkgver = 9.5.10
- pkgrel = 1
- url = https://gitlab.manjaro.org/applications/pamac
- install = pamac.install
- arch = i686
- arch = x86_64
- arch = arm
- arch = armv6h
- arch = armv7h
- arch = aarch64
- license = GPL3
- makedepends = gettext
- makedepends = itstool
- makedepends = vala>=0.45
- makedepends = meson
- makedepends = ninja
- makedepends = gobject-introspection
- makedepends = xorgproto
- depends = glib2>=2.42
- depends = json-glib
- depends = libsoup
- depends = dbus-glib
- depends = polkit
- depends = vte3>=0.38
- depends = gtk3>=3.22
- depends = libnotify
- depends = desktop-file-utils
- depends = pacman>=5.2
- depends = gnutls>=3.4
- depends = git
- depends = appstream-glib
- depends = archlinux-appstream-data
- optdepends = polkit-gnome: needed for authentification in Cinnamon, Gnome
- optdepends = lxsession: needed for authentification in Xfce, LXDE etc.
- optdepends = pamac-tray-appindicator: tray icon for KDE
- provides = pamac=9.5.10-1
- conflicts = pamac
- options = !emptydirs
- backup = etc/pamac.conf
- source = pamac-9.5.10-1.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/a474a10f2d5c67dfa971b6af1272869518e22c99/pamac-a474a10f2d5c67dfa971b6af1272869518e22c99.tar.gz
- sha256sums = e8e1abd1e4cf23341687a250c67988de5aadd021bd3371a12283c3f142aa5d2b
-
-pkgname = pamac-aur
-
+++ /dev/null
-*.gz
-*.tar
-*.tar.*
-/pkg/*
-/src/*
+++ /dev/null
-# Contributor: Zeph <zeph33@gmail.com>
-# Maintainer: Zeph <zeph33@gmail.com>
-# https://gitlab.manjaro.org/packages/extra/pamac
-ENABLE_FLATPAK=0
-ENABLE_SNAPD=0
-
-pkgname=pamac-aur
-pkgver=9.5.10
-pkgrel=1
-_pkgfixver=$pkgver
-
-_commit='a474a10f2d5c67dfa971b6af1272869518e22c99'
-sha256sums=('e8e1abd1e4cf23341687a250c67988de5aadd021bd3371a12283c3f142aa5d2b')
-
-pkgdesc="A Gtk3 frontend for libalpm"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url="https://gitlab.manjaro.org/applications/pamac"
-license=('GPL3')
-depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit' 'vte3>=0.38' 'gtk3>=3.22'
- 'libnotify' 'desktop-file-utils' 'pacman>=5.2' 'gnutls>=3.4' 'git'
- 'appstream-glib' 'archlinux-appstream-data')
-
-optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome'
- 'lxsession: needed for authentification in Xfce, LXDE etc.'
- 'pamac-tray-appindicator: tray icon for KDE')
-makedepends=('gettext' 'itstool' 'vala>=0.45' 'meson' 'ninja' 'gobject-introspection' 'xorgproto')
-backup=('etc/pamac.conf')
-conflicts=('pamac')
-provides=("pamac=$pkgver-$pkgrel")
-options=(!emptydirs)
-install=pamac.install
-source=("pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/$_commit/pamac-$_commit.tar.gz")
-define_meson=''
-if [ "${ENABLE_FLATPAK}" = 1 ]; then
- depends+=('flatpak')
- define_meson+=' -Denable-flatpak=true'
-fi
-
-if [ "${ENABLE_SNAPD}" = 1 ]; then
- depends+=('snapd' 'snapd-glib')
- define_meson+=' -Denable-snap=true'
-fi
-
-prepare() {
- cd "$srcdir/pamac-$_commit"
- # adjust version string
- sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" src/version.vala
-}
-
-build() {
- cd "$srcdir/pamac-$_commit"
- mkdir -p builddir
- cd builddir
- meson --buildtype=release \
- --prefix=/usr \
- --sysconfdir=/etc $define_meson
- # build
- ninja
-}
-
-package() {
- cd "$srcdir/pamac-$_commit/builddir"
-
- DESTDIR="$pkgdir" ninja install
-}
-# vim:set ts=2 sw=2 et:
+++ /dev/null
-post_install() {
- # enable flatpak repo
- if [ -f /usr/bin/flatpak ]; then
- flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- fi
- # enable systemd timers
- ln -sf /usr/lib/systemd/system/pamac-cleancache.timer /etc/systemd/system/multi-user.target.wants
- #ln -sf /usr/lib/systemd/system/pamac-mirrorlist.timer /etc/systemd/system/multi-user.target.wants
- # polkit agent
- printf '==> An authentication agent is required\n'
- printf ' Cinnamon, Deepin, GNOME, GNOME Flashback, KDE, LXDE, LXQt, MATE and Xfce\n'
- printf ' have an authentication agent already.\n'
- printf ' See https://wiki.archlinux.org/index.php/Polkit#Authentication_agents\n'
- printf ' for other desktop environments.\n'
-}
-
-post_upgrade() {
- # enable flatpak repo
- if [ -f /usr/bin/flatpak ]; then
- flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- fi
-}
-
-post_remove() {
- # disable systemd timers
- rm -f /etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer
- #rm -f /etc/systemd/system/multi-user.target.wants/pamac-mirrorlist.timer
-}
\ No newline at end of file
+++ /dev/null
-pkgbase = paper-icon-theme
- pkgdesc = Paper is an open source desktop theme and icon project by Sam Hewitt
- pkgver = 1.5.0
- pkgrel = 2
- url = https://snwh.org/paper
- arch = any
- license = CCPL:by-sa-4.0
- makedepends = meson
- depends = gtk-update-icon-cache
- provides = paper-icon-theme
- conflicts = paper-icon-theme-git
- source = paper-icon-theme-1.5.0.tar.gz::https://github.com/snwh/paper-icon-theme/archive/v.1.5.0.tar.gz
- md5sums = e7e2e22a4a34432f43846c815cbdbeb4
- sha512sums = be84bc332eba0e9c216435a130d3eed180fe1807d81ff7b3aadb3914fc130c9e243fb7fccef8febae1da6655f8e8a1bcf9420afb429e11e4c79bcbbb5bcd291b
-
-pkgname = paper-icon-theme
-
+++ /dev/null
-pkgname=paper-icon-theme
-pkgver=1.5.0
-pkgrel=2
-pkgdesc="Paper is an open source desktop theme and icon project by Sam Hewitt"
-arch=('any')
-url="https://snwh.org/paper"
-license=("CCPL:by-sa-4.0")
-depends=('gtk-update-icon-cache')
-makedepends=('meson')
-provides=('paper-icon-theme')
-conflicts=('paper-icon-theme-git')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/snwh/$pkgname/archive/v.$pkgver.tar.gz")
-md5sums=('e7e2e22a4a34432f43846c815cbdbeb4')
-sha512sums=('be84bc332eba0e9c216435a130d3eed180fe1807d81ff7b3aadb3914fc130c9e243fb7fccef8febae1da6655f8e8a1bcf9420afb429e11e4c79bcbbb5bcd291b')
-
-build() {
- cd "$pkgname-v.$pkgver"
- meson "build" --prefix=/usr
-}
-
-package() {
- cd "$pkgname-v.$pkgver"
- DESTDIR="${pkgdir}" ninja -C "build" install
-}
+++ /dev/null
-pkgbase = plymouth-theme-alter-pp
- pkgdesc = AlterLinux用のplymouthテーマ
- pkgver = 1.0.0
- pkgrel = 1
- url = https://github.com/yamad-linuxer/plymouth-theme-alter
- arch = any
- license = GPL
- depends = plymouth
- conflicts = plymouth-theme-alter-pp-git
- source = https://github.com/yamad-linuxer/plymouth-theme-alter/archive/1.0.0.zip
- md5sums = 6583b328581df987c6b22bfcc815dc13
-
-pkgname = plymouth-theme-alter-pp
-
+++ /dev/null
-# Maintainer: Yamada Hayao <shun819.mail@gmail.com>
-# Contributor: YamaD <yamad.linuxer@gmail.com>
-
-pkgname=plymouth-theme-alter-pp
-_themename=alter-pp
-_pkgname=plymouth-theme-alter
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="AlterLinux用のplymouthテーマ"
-arch=('any')
-url=https://github.com/yamad-linuxer/plymouth-theme-alter
-license=('GPL')
-depends=('plymouth')
-optdepends=()
-source=("${url}/archive/${pkgver}.zip")
-md5sums=('6583b328581df987c6b22bfcc815dc13')
-conflicts=('plymouth-theme-alter-pp-git')
-
-
-prepare () {
- cd "${srcdir}"
- mv ${_pkgname}-${pkgver}/${_themename} ./
- rm -rf "${_pkgname}-${pkgver}"
- rm ./${pkgver}.zip
-}
-
-build () {
- cd "${srcdir}"
- mkdir -p ./usr/share/plymouth/themes/${_themename}/
- cp -r ./${_themename}/intro/* ./usr/share/plymouth/themes/${_themename}/
- cp -r ./${_themename}/loop/* ./usr/share/plymouth/themes/${_themename}/
- cp -r ./${_themename}/misc/* ./usr/share/plymouth/themes/${_themename}/
-
- rm -rf ${_themename}
-}
-
-package() {
- mkdir -p "$pkgdir"
- cp -r * "$pkgdir"
-}
+++ /dev/null
-pkgbase = plymouth
- pkgdesc = A graphical boot splash screen with kernel mode-setting support
- pkgver = 0.9.5
- pkgrel = 6
- url = https://www.freedesktop.org/wiki/Software/Plymouth/
- arch = i686
- arch = x86_64
- license = GPL
- makedepends = docbook-xsl
- depends = libdrm
- depends = pango
- depends = systemd
- optdepends = ttf-dejavu: For true type font support
- optdepends = xf86-video-fbdev: Support special graphic cards on early startup
- optdepends = cantarell-fonts: True Type support for BGRT theme
- conflicts = plymouth-legacy
- conflicts = plymouth-nosystemd
- options = !libtool
- options = !emptydirs
- backup = etc/plymouth/plymouthd.conf
- source = https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/0.9.5/plymouth-0.9.5.tar.gz
- source = arch-logo.png
- source = plymouth.encrypt_hook
- source = plymouth.encrypt_install
- source = lxdm-plymouth.service
- source = lightdm-plymouth.service
- source = slim-plymouth.service
- source = sddm-plymouth.service
- source = plymouth-deactivate.service
- source = plymouth-start.service.in.patch
- source = plymouth-start.path
- source = plymouth.initcpio_hook
- source = plymouth.initcpio_install
- source = sd-plymouth.initcpio_install
- source = plymouth-quit.service.in.patch
- source = plymouth-update-initrd.patch
- sha256sums = 55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba
- sha256sums = de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7
- sha256sums = 7afa97d21444cbac7a6213edda09d9fa73ecbef1a6cea1e745f56669760c6120
- sha256sums = 373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a
- sha256sums = 06b31999cf60f49e536c7a12bc1c4f75f2671feb848bf5ccb91a963147e2680d
- sha256sums = 4b7e47fb8d1e00d8b550c1fa21c193480643dfc40965bc7b925657f720bd189f
- sha256sums = 9b5534921c5bf92a9285ba53b323209e812145c204ac5fed6899b7aad78300ef
- sha256sums = c39f526f7e99173bc8f012900f53257537a25e2d8c19e23df630f1fe9a7627ba
- sha256sums = 3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb
- sha256sums = 3a46f7faced877a913506d59757f0af60ad3d5f0bc365c56ed7ecc7aef75c5eb
- sha256sums = ce3d62f4c5a1b5c0ccadd15406c7430251d1a42b232721bfbfc747da1b13e3ff
- sha256sums = 2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769
- sha256sums = 2dd996a86beb1dc1fa5e45a14e98daa8fc505c5d1dff94bc5fdb3246a113d5ca
- sha256sums = 50a32014540c6603910b95ce0e40097089dde11fdde3f502c721b6b160a0b997
- sha256sums = a1766e3fae000e5158a23b5c01d2c615894e6c3f9923877ccc5ca1bcb36351fa
- sha256sums = 74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a
-
-pkgname = plymouth
-
+++ /dev/null
-# Maintainer: Taijian <taijian@posteo.de>
-# Contributor: Sebastian Lau <lauseb644@gmail.com>
-# Contributor Damian01w <damian01w@gmail.com>
-# Contributor: Padfoot <padfoot@exemail.com.au>
-#
-
-pkgname=plymouth
-pkgver=0.9.5
-pkgrel=6
-pkgdesc="A graphical boot splash screen with kernel mode-setting support"
-url="https://www.freedesktop.org/wiki/Software/Plymouth/"
-arch=('i686' 'x86_64')
-license=('GPL')
-
-depends=('libdrm' 'pango' 'systemd')
-makedepends=('docbook-xsl')
-optdepends=('ttf-dejavu: For true type font support'
- 'xf86-video-fbdev: Support special graphic cards on early startup'
- 'cantarell-fonts: True Type support for BGRT theme')
-conflicts=('plymouth-legacy' 'plymouth-nosystemd')
-backup=('etc/plymouth/plymouthd.conf')
-
-options=('!libtool' '!emptydirs')
-
-source=("https://gitlab.freedesktop.org/${pkgname}/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
- 'arch-logo.png'
- 'plymouth.encrypt_hook'
- 'plymouth.encrypt_install'
- 'lxdm-plymouth.service'
- 'lightdm-plymouth.service'
- 'slim-plymouth.service'
- 'sddm-plymouth.service'
- 'plymouth-deactivate.service'
- 'plymouth-start.service.in.patch'
- 'plymouth-start.path'
- 'plymouth.initcpio_hook'
- 'plymouth.initcpio_install'
- 'sd-plymouth.initcpio_install'
- 'plymouth-quit.service.in.patch'
- 'plymouth-update-initrd.patch'
-)
-
-sha256sums=('55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba'
- 'de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7'
- '7afa97d21444cbac7a6213edda09d9fa73ecbef1a6cea1e745f56669760c6120'
- '373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a'
- '06b31999cf60f49e536c7a12bc1c4f75f2671feb848bf5ccb91a963147e2680d'
- '4b7e47fb8d1e00d8b550c1fa21c193480643dfc40965bc7b925657f720bd189f'
- '9b5534921c5bf92a9285ba53b323209e812145c204ac5fed6899b7aad78300ef'
- 'c39f526f7e99173bc8f012900f53257537a25e2d8c19e23df630f1fe9a7627ba'
- '3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb'
- '3a46f7faced877a913506d59757f0af60ad3d5f0bc365c56ed7ecc7aef75c5eb'
- 'ce3d62f4c5a1b5c0ccadd15406c7430251d1a42b232721bfbfc747da1b13e3ff'
- '2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769'
- '2dd996a86beb1dc1fa5e45a14e98daa8fc505c5d1dff94bc5fdb3246a113d5ca'
- '50a32014540c6603910b95ce0e40097089dde11fdde3f502c721b6b160a0b997'
- 'a1766e3fae000e5158a23b5c01d2c615894e6c3f9923877ccc5ca1bcb36351fa'
- '74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a')
-
-prepare() {
- cd "$srcdir"/${pkgname}-${pkgver}
- patch -p1 -i $srcdir/plymouth-update-initrd.patch
- patch -p1 -i $srcdir/plymouth-quit.service.in.patch
- patch -p1 -i $srcdir/plymouth-start.service.in.patch
-}
-
-build() {
- cd "$srcdir"/${pkgname}-${pkgver}
-
- LDFLAGS="$LDFLAGS -ludev" ./autogen.sh \
- --prefix=/usr \
- --exec-prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --sbindir=/usr/bin \
- --enable-systemd-integration \
- --enable-drm \
- --enable-tracing \
- --enable-pango \
- --enable-gtk=no \
- --with-release-file=/etc/os-release \
- --with-logo=/usr/share/plymouth/arch-logo.png \
- --with-background-color=0x000000 \
- --with-background-start-color-stop=0x000000 \
- --with-background-end-color-stop=0x4D4D4D \
- --without-rhgb-compat-link \
- --without-system-root-install \
- --with-runtimedir=/run
-
- make
-}
-
-package() {
- cd "$srcdir"/${pkgname}-${pkgver}
-
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$srcdir/arch-logo.png" "$pkgdir/usr/share/plymouth/arch-logo.png"
-
- install -Dm644 "$srcdir/plymouth.encrypt_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt"
- install -Dm644 "$srcdir/plymouth.encrypt_install" "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt"
- install -Dm644 "$srcdir/plymouth.initcpio_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth"
- install -Dm644 "$srcdir/plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/plymouth"
- install -Dm644 "$srcdir/sd-plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/sd-plymouth"
-
- for i in {sddm,lxdm,slim,lightdm}-plymouth.service; do
- install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i"
- done
-
- ln -s "/usr/lib/systemd/system/gdm.service" "$pkgdir/usr/lib/systemd/system/gdm-plymouth.service"
-
- install -Dm644 "$srcdir/plymouth-deactivate.service" "$pkgdir/usr/lib/systemd/system/plymouth-deactivate.service"
- install -Dm644 "$srcdir/plymouth-start.path" "$pkgdir/usr/lib/systemd/system/plymouth-start.path"
- install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
-}
+++ /dev/null
-[Unit]
-Description=Light Display Manager
-Documentation=man:lightdm(1)
-Conflicts=getty@tty1.service plymouth-quit.service
-After=getty@tty1.service systemd-user-sessions.service plymouth-quit.service acpid.service
-
-[Service]
-ExecStart=/usr/bin/lightdm
-Restart=always
-IgnoreSIGPIPE=no
-BusName=org.freedesktop.DisplayManager
-
-[Install]
-Alias=display-manager.service
+++ /dev/null
-[Unit]
-Description=LXDE Display Manager
-Conflicts=getty@tty1.service plymouth-quit.service
-Wants=plymouth-deactivate.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service
-
-[Service]
-ExecStart=/usr/sbin/lxdm
-Restart=always
-IgnoreSIGPIPE=no
-
-[Install]
-Alias=display-manager.service
+++ /dev/null
-[Unit]
-Description=Deactivate Plymouth Boot Screen
-After=rc-local.service plymouth-start.service systemd-user-sessions.service
-Before=getty@tty1.service
-
-[Service]
-ExecStart=/usr/bin/plymouth deactivate
-Type=oneshot
-TimeoutSec=20
-RemainAfterExit=yes
+++ /dev/null
-diff -aur plymouth.src/systemd-units/plymouth-quit.service.in plymouth.patch/systemd-units/plymouth-quit.service.in
---- plymouth.src/systemd-units/plymouth-quit.service.in 2014-02-20 19:38:13.329427597 +1100
-+++ plymouth.patch/systemd-units/plymouth-quit.service.in 2014-02-20 19:40:52.619343839 +1100
-@@ -1,8 +1,9 @@
- [Unit]
- Description=Terminate Plymouth Boot Screen
- After=rc-local.service plymouth-start.service systemd-user-sessions.service
-+Before=getty@tty1.service
-
- [Service]
--ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit
-+ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash
- Type=oneshot
- TimeoutSec=20
+++ /dev/null
-[Unit]
-Description=Automatically Start Plymouth Boot Screen
-
-[Path]
-PathExistsGlob=/sys/class/graphics/fb*/device/drm/
-Unit=plymouth-start.service
-
-[Install]
-WantedBy=sysinit.target
-
+++ /dev/null
---- plymouth.src/systemd-units/Downloads/plymouth-start.service.in
-+++ plymouth.patch/systemd-units/plymouth-start.service.in
-@@ -12,3 +12,6 @@
- RemainAfterExit=yes
- KillMode=none
- SendSIGKILL=no
-+
-+[Install]
-+WantedBy=sysinit.target
+++ /dev/null
-diff -aur plymouth.src/scripts/plymouth-update-initrd plymouth.patch/scripts/plymouth-update-initrd
---- plymouth.src/scripts/plymouth-update-initrd 2014-02-20 19:38:13.319427393 +1100
-+++ plymouth.patch/scripts/plymouth-update-initrd 2014-02-20 19:54:13.035553244 +1100
-@@ -1,2 +1,4 @@
- #!/bin/bash
--dracut -f
-+find /etc/mkinitcpio.d/ -name \*.preset -a \! -name example.preset | while read p; do
-+ mkinitcpio -p $p
-+done
+++ /dev/null
-#!/bin/bash
-
-run_hook() {
- modprobe -a -q dm-crypt >/dev/null 2>&1
- [ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
-
- # Get keyfile if specified
- ckeyfile="/crypto_keyfile.bin"
- if [ -n "$cryptkey" ]; then
- IFS=: read ckdev ckarg1 ckarg2 <<EOF
-$cryptkey
-EOF
-
- if [ "$ckdev" = "rootfs" ]; then
- ckeyfile=$ckarg1
- elif resolved=$(resolve_device "${ckdev}" ${rootdelay}); then
- case ${ckarg1} in
- *[!0-9]*)
- # Use a file on the device
- # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
- mkdir /ckey
- mount -r -t "$ckarg1" "$resolved" /ckey
- dd if="/ckey/$ckarg2" of="$ckeyfile" >/dev/null 2>&1
- umount /ckey
- ;;
- *)
- # Read raw data from the block device
- # ckarg1 is numeric: ckarg1=offset, ckarg2=length
- dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1
- ;;
- esac
- fi
- [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase."
- fi
-
- if [ -n "${cryptdevice}" ]; then
- DEPRECATED_CRYPT=0
- IFS=: read cryptdev cryptname cryptoptions <<EOF
-$cryptdevice
-EOF
- else
- DEPRECATED_CRYPT=1
- cryptdev="${root}"
- cryptname="root"
- fi
-
- warn_deprecated() {
- echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated"
- echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead."
- }
-
- for cryptopt in ${cryptoptions//,/ }; do
- case ${cryptopt} in
- allow-discards)
- cryptargs="${cryptargs} --allow-discards"
- ;;
- *)
- echo "Encryption option '${cryptopt}' not known, ignoring." >&2
- ;;
- esac
- done
-
- if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
- if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
- [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
- dopassphrase=1
- # If keyfile exists, try to use that
- if [ -f ${ckeyfile} ]; then
- if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then
- dopassphrase=0
- else
- echo "Invalid keyfile. Reverting to passphrase."
- fi
- fi
- # Ask for a passphrase
- if [ ${dopassphrase} -gt 0 ]; then
- echo
- echo "A password is required to access the ${cryptname} volume:"
- plymouth ask-for-password --prompt="Password for ${cryptname} volume" --dont-pause-progress --number-of-tries=5 --command="/sbin/cryptsetup luksOpen --key-file=- ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}"
- sleep 2
- fi
- if [ -e "/dev/mapper/${cryptname}" ]; then
- if [ ${DEPRECATED_CRYPT} -eq 1 ]; then
- export root="/dev/mapper/root"
- fi
- else
- err "Password succeeded, but ${cryptname} creation failed, aborting..."
- exit 1
- fi
- elif [ -n "${crypto}" ]; then
- [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
- msg "Non-LUKS encrypted device found..."
- if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then
- err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip"
- err "Non-LUKS decryption not attempted..."
- return 1
- fi
- exe="cryptsetup create $cryptname $resolved $cryptargs"
- IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF
-$crypto
-EOF
- [ -n "$c_hash" ] && exe="$exe --hash '$c_hash'"
- [ -n "$c_cipher" ] && exe="$exe --cipher '$c_cipher'"
- [ -n "$c_keysize" ] && exe="$exe --key-size '$c_keysize'"
- [ -n "$c_offset" ] && exe="$exe --offset '$c_offset'"
- [ -n "$c_skip" ] && exe="$exe --skip '$c_skip'"
- if [ -f "$ckeyfile" ]; then
- exe="$exe --key-file $ckeyfile"
- else
- exe="$exe --verify-passphrase"
- echo ""
- echo "A password is required to access the ${cryptname} volume:"
- fi
- eval "$exe $CSQUIET"
-
- if [ $? -ne 0 ]; then
- err "Non-LUKS device decryption failed. verify format: "
- err " crypto=hash:cipher:keysize:offset:skip"
- exit 1
- fi
- if [ -e "/dev/mapper/${cryptname}" ]; then
- if [ ${DEPRECATED_CRYPT} -eq 1 ]; then
- export root="/dev/mapper/root"
- fi
- else
- err "Password succeeded, but ${cryptname} creation failed, aborting..."
- exit 1
- fi
- else
- err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified."
- fi
- fi
- rm -f ${ckeyfile}
-}
+++ /dev/null
-#!/bin/bash
-
-build() {
- local mod
-
- add_module dm-crypt
- if [[ $CRYPTO_MODULES ]]; then
- for mod in $CRYPTO_MODULES; do
- add_module "$mod"
- done
- else
- add_all_modules '/crypto/'
- fi
-
- add_binary "cryptsetup"
- add_binary "dmsetup"
- add_file "/usr/lib/udev/rules.d/10-dm.rules"
- add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
- add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
- add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
-
- # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
- add_binary "/usr/lib/libgcc_s.so.1"
-
- add_runscript
-}
-
-help() {
- cat <<HELPEOF
-This hook allows for an encrypted root device. Users should specify the device
-to be unlocked using 'cryptdevice=device:dmname' on the kernel command line,
-where 'device' is the path to the raw device, and 'dmname' is the name given to
-the device after unlocking, and will be available as /dev/mapper/dmname.
-
-For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on
-the kernel cmdline, where 'device' represents the raw block device where the key
-exists, 'fstype' is the filesystem type of 'device' (or auto), and 'path' is
-the absolute path of the keyfile within the device.
-
-Without specifying a keyfile, you will be prompted for the password at runtime.
-This means you must have a keyboard available to input it, and you may need
-the keymap hook as well to ensure that the keyboard is using the layout you
-expect.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
+++ /dev/null
-run_earlyhook(){
- # first trigger graphics subsystem
- udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
- # first trigger graphics and tty subsystem
- udevadm trigger --action=add --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty >/dev/null 2>&1
-
- udevadm settle --timeout=30 2>&1
-
- /usr/bin/mknod /dev/fb c 29 &>/dev/null
- /usr/bin/mkdir -p /dev/pts
- /usr/bin/mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts || true
- /usr/bin/plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session
-}
-
-run_hook() {
- /usr/bin/plymouth --show-splash
-}
-
-run_latehook(){
- /usr/bin/plymouth update-root-fs --new-root-dir=/new_root
-}
-
-# vim: set ft=sh:
+++ /dev/null
-#!/bin/bash
-# /etc/initcpio/install/plymouth — mkinitcpio hook for plymouth
-
-build() {
- add_dir /dev/pts
- add_dir /usr/share/plymouth/themes
- add_dir /run/plymouth
-
- DATADIR="/usr/share/plymouth"
- PLYMOUTH_LOGO_FILE="${DATADIR}/arch-logo.png"
- PLYMOUTH_THEME_NAME="$(/usr/bin/plymouth-set-default-theme)"
- PLYMOUTH_THEME_DIR="${DATADIR}/themes/${PLYMOUTH_THEME_NAME}"
- PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//')
- PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
- PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')"
-
- add_binary /usr/bin/plymouthd
- add_binary /usr/bin/plymouth
-
- add_file ${DATADIR}/themes/text/text.plymouth
- add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so
- add_file ${DATADIR}/themes/details/details.plymouth
- add_binary ${PLYMOUTH_PLUGIN_PATH}/details.so
-
- add_file "${PLYMOUTH_LOGO_FILE}"
- add_file /etc/os-release
- add_file /etc/plymouth/plymouthd.conf
- add_file ${DATADIR}/plymouthd.defaults
-
-
- if [ -f "/usr/share/fonts/TTF/DejaVuSans.ttf" -o -f "/usr/share/fonts/cantarell/Cantarell-Thin.otf" ]; then
- add_binary ${PLYMOUTH_PLUGIN_PATH}/label.so
- add_file "/etc/fonts/fonts.conf"
- fi
-
- if [ -f "/usr/share/fonts/TTF/DejaVuSans.ttf" ]; then
- add_file "/usr/share/fonts/TTF/DejaVuSans.ttf"
- add_file "/etc/fonts/conf.d/57-dejavu-sans.conf"
- fi
-
- if [ -f "/usr/share/fonts/cantarell/Cantarell-Thin.otf" ]; then
- add_file "/usr/share/fonts/cantarell/Cantarell-Thin.otf"
- add_file "/usr/share/fonts/cantarell/Cantarell-Regular.otf"
- add_file "/etc/fonts/conf.d/60-latin.conf"
- fi
-
- if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
- echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
- exit 1
- fi
-
- add_binary ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so
-
- add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so
- add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
-
- if [ -d ${PLYMOUTH_THEME_DIR} ]; then
- add_full_dir ${PLYMOUTH_THEME_DIR}
- fi
-
- if [ "${PLYMOUTH_IMAGE_DIR}" != "${PLYMOUTH_THEME_DIR}" -a -d ${PLYMOUTH_IMAGE_DIR} ]; then
- add_full_dir ${PLYMOUTH_IMAGE_DIR}
- fi
-
- add_file /usr/lib/udev/rules.d/70-uaccess.rules
- add_file /usr/lib/udev/rules.d/71-seat.rules
-
- # suppress a warning in glib (which the label control uses)
- # about uid 0 by building a dummy NSS stack (LP #649917)
- add_file /etc/passwd
- add_file /etc/nsswitch.conf
- add_binary "$(readlink -e /lib/libnss_files.so.2)"
- add_file /lib/libnss_files.so.2
-
- add_runscript
-}
-
-help() {
- cat <<HELPEOF
-This hook includes plymouth in the initramfs image.
-HELPEOF
-}
+++ /dev/null
-#!/bin/bash
-# /etc/initcpio/install/sd-plymouth — mkinitcpio/systemd hook for plymouth
-
-build() {
- add_dir /dev/pts
- add_dir /usr/share/plymouth/themes
- add_dir /run/plymouth
-
- DATADIR="/usr/share/plymouth"
- PLYMOUTH_LOGO_FILE="${DATADIR}/arch-logo.png"
- PLYMOUTH_THEME_NAME="$(/usr/bin/plymouth-set-default-theme)"
- PLYMOUTH_THEME_DIR="${DATADIR}/themes/${PLYMOUTH_THEME_NAME}"
- PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//')
- PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
- PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')"
-
- add_binary /usr/bin/plymouthd
- add_binary /usr/bin/plymouth
-
- add_file ${DATADIR}/themes/text/text.plymouth
- add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so
- add_file ${DATADIR}/themes/details/details.plymouth
- add_binary ${PLYMOUTH_PLUGIN_PATH}/details.so
-
- add_file "${PLYMOUTH_LOGO_FILE}"
- add_file /etc/os-release
- add_file /etc/plymouth/plymouthd.conf
- add_file ${DATADIR}/plymouthd.defaults
-
-
- if [ -f "/usr/share/fonts/TTF/DejaVuSans.ttf" -o -f "/usr/share/fonts/cantarell/Cantarell-Thin.otf" ]; then
- add_binary ${PLYMOUTH_PLUGIN_PATH}/label.so
- add_file "/etc/fonts/fonts.conf"
- fi
-
- if [ -f "/usr/share/fonts/TTF/DejaVuSans.ttf" ]; then
- add_file "/usr/share/fonts/TTF/DejaVuSans.ttf"
- add_file "/etc/fonts/conf.d/57-dejavu-sans.conf"
- fi
-
- if [ -f "/usr/share/fonts/cantarell/Cantarell-Thin.otf" ]; then
- add_file "/usr/share/fonts/cantarell/Cantarell-Thin.otf"
- add_file "/usr/share/fonts/cantarell/Cantarell-Regular.otf"
- add_file "/etc/fonts/conf.d/60-latin.conf"
- fi
-
- if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
- echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
- exit 1
- fi
-
- add_binary ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so
-
- add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so
- add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
-
- if [ -d ${PLYMOUTH_THEME_DIR} ]; then
- add_full_dir ${PLYMOUTH_THEME_DIR}
- fi
-
- if [ "${PLYMOUTH_IMAGE_DIR}" != "${PLYMOUTH_THEME_DIR}" -a -d ${PLYMOUTH_IMAGE_DIR} ]; then
- add_full_dir ${PLYMOUTH_IMAGE_DIR}
- fi
-
- add_udev_rule 70-uaccess.rules
- add_udev_rule 71-seat.rules
-
- map add_systemd_unit \
- systemd-ask-password-plymouth.path \
- systemd-ask-password-plymouth.service \
- plymouth-halt.service \
- plymouth-kexec.service \
- plymouth-poweroff.service \
- plymouth-quit-wait.service \
- plymouth-quit.service \
- plymouth-read-write.service \
- plymouth-reboot.service \
- plymouth-start.service \
- plymouth-switch-root.service
-}
-
-help() {
- cat <<HELPEOF
-This hook includes plymouth in a systemd-based initramfs image.
-HELPEOF
-}
+++ /dev/null
-[Unit]
-Description=Simple Desktop Display Manager
-Documentation=man:sddm(1) man:sddm.conf(5)
-Conflicts=getty@tty1.service
-Wants=plymouth-deactivate.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service plymouth-deactivate.service
-
-[Service]
-ExecStart=/usr/bin/sddm
-Restart=always
-
-[Install]
-Alias=display-manager.service
+++ /dev/null
-[Unit]
-Description=SLiM Simple Login Manager
-Conflicts=getty@tty1.service plymouth-quit.service
-Wants=plymouth-deactivate.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-Restart=always
-IgnoreSIGPIPE=no
-StandardOutput=syslog
-
-[Install]
-Alias=display-manager.service
+++ /dev/null
-pkgbase = pythonqt
- pkgdesc = A dynamic Python binding for Qt applications
- pkgver = 3.2
- pkgrel = 6
- url = http://pythonqt.sourceforge.net/
- arch = i686
- arch = x86_64
- license = LGPL2.1
- makedepends = git
- makedepends = qt5-tools
- depends = python
- depends = qt5-multimedia
- depends = qt5-svg
- depends = qt5-webkit
- depends = qt5-declarative
- depends = qt5-xmlpatterns
- conflicts = pythonqt-svn
- conflicts = pythonqt-for-screencloud
- conflicts = qt5-python27-git
- replaces = pythonqt-qt5
- source = http://downloads.sourceforge.net/project/pythonqt/pythonqt/PythonQt-3.2/PythonQt3.2.zip
- source = fix_python_version.patch
- source = pkgconfig_file.prf
- source = create_pkgconfig_file.patch
- source = faster_build.patch
- sha512sums = 1ee0f50f5035568b38e945108f5496ba64355c6357c1ea8dfc17ad90fa360540769f94e0b3e0e398176e8a21c8afe139607f0b5a2e82c63f1cbd40201a25e0f0
- sha512sums = 9747898842f60bdfc5c38a54f7516a46b46279c57cbfa6c7f4796aa1ca5771ebb121f07fe4d09d23c60c92530750ee265808484f3e07aaae72065ed51c3896c7
- sha512sums = a146b46d4fb7162dc4290c662971742a4f85e11b2f5f9d71b4cd52f500ed7f0c3c1cf9034ead2e91f3c4e133446838fa530b3e13d3618617c695f2a433fdbb23
- sha512sums = 9386ec26b3a59de492a9d8c31ca6c4f9e220510070a6d5c0a063618e3f6e7c4db611b27f6b46c028b5613e70453db67c060533e6940d72ff9ea623d80c2f99f9
- sha512sums = 3c560169a0c10eeea21c3f6d078220caea70886d0203ef6dee1157afdd0bc1c7198cc65c6f5b2b5f4f61e416fa52330e75f282534402c8e00b2fe0829f17ce2a
-
-pkgname = pythonqt
-
+++ /dev/null
-# Maintainer: Alfredo Ramos <alfredo dot ramos at yandex dot com>
-# Contributor: Chris <christopher.r.mullins g-mail>
-# Contributor: Ainola
-# Contributor: speps
-
-pkgname=pythonqt
-pkgver=3.2
-pkgrel=6
-pkgdesc='A dynamic Python binding for Qt applications'
-arch=('i686' 'x86_64')
-url='http://pythonqt.sourceforge.net/'
-license=('LGPL2.1')
-
-depends=('python' 'qt5-multimedia' 'qt5-svg' 'qt5-webkit' 'qt5-declarative' 'qt5-xmlpatterns')
-makedepends=('git' 'qt5-tools')
-conflicts=("${pkgname}-svn" "${pkgname}-for-screencloud" 'qt5-python27-git')
-replaces=("${pkgname}-qt5")
-
-source=(
- "http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/PythonQt-${pkgver}/PythonQt${pkgver}.zip"
- 'fix_python_version.patch'
- 'pkgconfig_file.prf'
- 'create_pkgconfig_file.patch'
- 'faster_build.patch'
-)
-sha512sums=(
- '1ee0f50f5035568b38e945108f5496ba64355c6357c1ea8dfc17ad90fa360540769f94e0b3e0e398176e8a21c8afe139607f0b5a2e82c63f1cbd40201a25e0f0'
- '9747898842f60bdfc5c38a54f7516a46b46279c57cbfa6c7f4796aa1ca5771ebb121f07fe4d09d23c60c92530750ee265808484f3e07aaae72065ed51c3896c7'
- 'a146b46d4fb7162dc4290c662971742a4f85e11b2f5f9d71b4cd52f500ed7f0c3c1cf9034ead2e91f3c4e133446838fa530b3e13d3618617c695f2a433fdbb23'
- '9386ec26b3a59de492a9d8c31ca6c4f9e220510070a6d5c0a063618e3f6e7c4db611b27f6b46c028b5613e70453db67c060533e6940d72ff9ea623d80c2f99f9'
- '3c560169a0c10eeea21c3f6d078220caea70886d0203ef6dee1157afdd0bc1c7198cc65c6f5b2b5f4f61e416fa52330e75f282534402c8e00b2fe0829f17ce2a'
-)
-
-prepare() {
- # Create build directory
- mkdir -p "${srcdir}"/build
- cd "${srcdir}"/build
- cp -R ../PythonQt${pkgver}/* ./
-
- # Fix python version
- patch -Np1 < ../fix_python_version.patch
-
- # Add qmake configuration file to generate
- # PythonQt pkg-config file (*.pc)
- cp ../pkgconfig_file.prf build/
- patch -Np1 < ../create_pkgconfig_file.patch
-
- # Do not build tests nor examples
- patch -Np1 < ../faster_build.patch
-}
-
-build() {
- # Building package
- cd "${srcdir}"/build
- qmake-qt5 \
- QMAKE_CFLAGS="${CFLAGS}" \
- QMAKE_CXXFLAGS="${CXXFLAGS}" \
- CONFIG+=release \
- CONFIG+=c++14
- make
-}
-
-package() {
- cd "${srcdir}"/build
-
- # Includes
- mkdir -p "${pkgdir}"/usr/include/PythonQt/{gui,extensions/PythonQt_QtAll}
- cp ../PythonQt${pkgver}/src/*.h "${pkgdir}"/usr/include/PythonQt/
- cp ../PythonQt${pkgver}/src/gui/*.h "${pkgdir}"/usr/include/PythonQt/gui/
- cp ../PythonQt${pkgver}/extensions/PythonQt_QtAll/*.h "${pkgdir}"/usr/include/PythonQt/extensions/PythonQt_QtAll/
-
- # Library
- mkdir -p "${pkgdir}"/usr/lib
- cp -a lib/*.so* "${pkgdir}"/usr/lib/
-
- # pkg-config file
- mkdir -p "${pkgdir}"/usr/share/
- cp -R pkgconfig "${pkgdir}"/usr/share/
-}
+++ /dev/null
-diff -uprNEBZ --suppress-blank-empty b/src/src.pro c/src/src.pro
---- b/src/src.pro 2017-06-06 02:26:06.000000000 -0500
-+++ c/src/src.pro 2017-06-13 13:00:29.533614419 -0500
-@@ -41,3 +41,5 @@ include ( src.pri )
- \r
- include($${PYTHONQT_GENERATED_PATH}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin.pri)\r
- include($${PYTHONQT_GENERATED_PATH}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin.pri)\r
-+\r
-+include(../build/pkgconfig_file.prf)\r
+++ /dev/null
-diff -uprNEBZ --suppress-blank-empty c/PythonQt.pro d/PythonQt.pro
---- c/PythonQt.pro 2009-04-09 04:32:52.000000000 -0500
-+++ d/PythonQt.pro 2017-07-02 22:43:46.132328898 -0500
-@@ -1,4 +1,4 @@
- TEMPLATE = subdirs\r
- \r
- CONFIG += ordered\r
--SUBDIRS = generator src extensions tests examples\r
-+SUBDIRS = generator src extensions\r
+++ /dev/null
-diff -uprNEBZ --suppress-blank-empty a/build/python.prf b/build/python.prf
---- a/build/python.prf 2016-06-09 06:10:52.000000000 -0500
-+++ b/build/python.prf 2017-06-08 10:03:40.858019605 -0500
-@@ -2,7 +2,8 @@
-
- # Change this variable to your python version (2.6, 2.7, 3.3, ...)
- win32:PYTHON_VERSION=27
--unix:PYTHON_VERSION=2.7
-+# Use Python3
-+unix:PYTHON_VERSION=3
- \r
- macx {\r
- # for macx you need to have the Python development kit installed as framework\r
+++ /dev/null
-# Generate pkg-config file (*.pc)
-CONFIG += create_pc create_prl no_install_prl
-
-# pkg-config file metadata
-QMAKE_PKGCONFIG_NAME = PythonQt
-QMAKE_PKGCONFIG_FILE = $${QMAKE_PKGCONFIG_NAME}
-QMAKE_PKGCONFIG_VERSION = $${VERSION}
-QMAKE_PKGCONFIG_DESCRIPTION = A dynamic Python binding for Qt applications
-QMAKE_PKGCONFIG_PREFIX = $$[QT_HOST_PREFIX]
-QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
-QMAKE_PKGCONFIG_INCDIR = $${QMAKE_PKGCONFIG_PREFIX}/include/$${QMAKE_PKGCONFIG_NAME}
-QMAKE_PKGCONFIG_DESTDIR = ../pkgconfig
+++ /dev/null
-pkgbase = qt5-styleplugins
- pkgdesc = Additional style plugins for Qt5
- pkgver = 5.0.0.20170311
- pkgrel = 24
- url = https://github.com/qt/qtstyleplugins
- arch = x86_64
- arch = aarch64
- arch = i686
- license = LGPL
- depends = qt5-base
- depends = gtk2
- source = qt5-styleplugins-335dbece103e2cbf6c7cf819ab6672c2956b17b3.tar.gz::https://github.com/qt/qtstyleplugins/archive/335dbece103e2cbf6c7cf819ab6672c2956b17b3.tar.gz
- source = 0001-fix-build-against-Qt-5.15.patch
- source = 0002-fix-gtk2-background.patch
- sha512sums = e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d
- sha512sums = f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce
- sha512sums = c39b468c93eaada7d49df9547627fbf91d50292523566ef93287ce0e958b29e6c3635f6e77ad42c4f449a062cc63b68e9f2a24c89524165649f776d205fb5382
-
-pkgname = qt5-styleplugins
-
+++ /dev/null
-From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Thu, 28 May 2020 12:35:42 +0200
-Subject: [PATCH] fix build against Qt 5.15
-
-With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application
-palette handling between QGuiApplication and QApplication")
-QApplicationPrivate::setSystemPalette is no longer used and necessary.
----
- src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++
- src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
-index 36169c9..2544593 100644
---- a/src/plugins/styles/gtk2/qgtkstyle.cpp
-+++ b/src/plugins/styles/gtk2/qgtkstyle.cpp
-@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app)
- // not supported as these should be entirely determined by
- // current Gtk settings
- if (app->desktopSettingsAware() && d->isThemeAvailable()) {
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- QApplicationPrivate::setSystemPalette(standardPalette());
-+#endif
- QApplicationPrivate::setSystemFont(d->getThemeFont());
- d->applyCustomPaletteHash();
- if (!d->isKDE4Session())
-diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-index e57b3d8..e71beb0 100644
---- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-+++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme()
- if (oldTheme != QGtkStylePrivate::getThemeName()) {
- oldTheme = QGtkStylePrivate::getThemeName();
- QPalette newPalette = qApp->style()->standardPalette();
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- QApplicationPrivate::setSystemPalette(newPalette);
-+#endif
- QApplication::setPalette(newPalette);
- if (!QGtkStylePrivate::instances.isEmpty()) {
- QGtkStylePrivate::instances.last()->initGtkWidgets();
---
-2.26.2
-
+++ /dev/null
-From 20b0985a77df913585628d49a3b541fb957ae366 Mon Sep 17 00:00:00 2001
-From: gamezelda
-Date: Thu, 4 Jun 2020 00:06:50 +0200
-Subject: [PATCH] fix setting background palette
-
----
- src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
-index 2544593..6138bd2 100644
---- a/src/plugins/styles/gtk2/qgtkstyle.cpp
-+++ b/src/plugins/styles/gtk2/qgtkstyle.cpp
-@@ -442,6 +442,8 @@ void QGtkStyle::polish(QApplication *app)
- if (app->desktopSettingsAware() && d->isThemeAvailable()) {
- #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- QApplicationPrivate::setSystemPalette(standardPalette());
-+#else
-+ QApplication::setPalette(standardPalette());
- #endif
- QApplicationPrivate::setSystemFont(d->getThemeFont());
- d->applyCustomPaletteHash();
---
-2.27.0
-
+++ /dev/null
-# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
-
-pkgname=qt5-styleplugins
-pkgver=5.0.0.20170311
-_commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3
-pkgdesc='Additional style plugins for Qt5'
-pkgrel=24
-arch=('x86_64' 'aarch64' 'i686')
-url="https://github.com/qt/qtstyleplugins"
-license=('LGPL')
-depends=('qt5-base' 'gtk2')
-source=(
- "${pkgname}-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz"
- "0001-fix-build-against-Qt-5.15.patch"
- "0002-fix-gtk2-background.patch"
-)
-sha512sums=(
- 'e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d'
- 'f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce'
- 'c39b468c93eaada7d49df9547627fbf91d50292523566ef93287ce0e958b29e6c3635f6e77ad42c4f449a062cc63b68e9f2a24c89524165649f776d205fb5382'
-)
-
-prepare() {
- cd qtstyleplugins-${_commit}
-
- for p in "$srcdir"/*.patch; do
- patch -p1 < "$p"
- done
-}
-
-build() {
- cd qtstyleplugins-${_commit}
-
- qmake PREFIX='/usr' \
- CONFIG+='nostrip' \
- QMAKE_CFLAGS_RELEASE="$CFLAGS" \
- QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS"
- make
-}
-
-package() {
- cd qtstyleplugins-${_commit}
-
- make INSTALL_ROOT="${pkgdir}" install
-}
+++ /dev/null
-_5_0_0_2_changes() {
- echo ':: Upstream added a gtk2 platform theme'
- # shellcheck disable=SC2016
- echo ' unexport `QT_STYLE_OVERRIDE`'
- # shellcheck disable=SC2016
- echo ' export `QT_QPA_PLATFORMTHEME=gtk2`'
-}
-
-post_upgrade() {
- local versions=(
- '5.0.0-2'
- )
- local version
- for version in "${versions[@]}"; do
- if [[ "$( vercmp "${version}" "${2}" )" -eq 1 ]]; then
- # shellcheck disable=SC2091
- "$( printf '_%s_changes' "${version}" | perl -p -e 's/\.|-/_/g' )"
- fi
- done
-}
+++ /dev/null
-pkgbase = ulauncher
- pkgdesc = Application launcher for Linux
- pkgver = 5.8.0
- pkgrel = 1
- url = https://ulauncher.io
- arch = any
- license = GPL3
- makedepends = python-distutils-extra
- depends = gobject-introspection-runtime
- depends = libappindicator-gtk3
- depends = libkeybinder3
- depends = webkit2gtk
- depends = python-dbus
- depends = python-gobject
- depends = python-cairo
- depends = python-pyinotify
- depends = python-levenshtein
- depends = python-xdg
- depends = python-websocket-client
- provides = ulauncher
- conflicts = ulauncher
- source = https://github.com/Ulauncher/Ulauncher/releases/download/5.8.0/ulauncher_5.8.0.tar.gz
- sha256sums = SKIP
-
-pkgname = ulauncher
-
+++ /dev/null
-# Maintainer: Aleksandr Gornostal <ulauncher.app@gmail.com>
-
-# To install, run `makepkg -is`
-
-pkgname=ulauncher
-pkgver=5.8.0
-pkgrel=1
-pkgdesc='Application launcher for Linux'
-arch=('any')
-url="https://ulauncher.io"
-license=('GPL3')
-depends=('gobject-introspection-runtime' 'libappindicator-gtk3' 'libkeybinder3' 'webkit2gtk'
- "python-"{dbus,gobject,cairo,pyinotify,levenshtein,xdg,websocket-client})
-makedepends=('python-distutils-extra')
-provides=("${pkgname%-*}")
-conflicts=("${pkgname%-*}")
-source=("https://github.com/Ulauncher/Ulauncher/releases/download/5.8.0/ulauncher_5.8.0.tar.gz")
-sha256sums=('SKIP')
-
-build() {
- cd ulauncher
- python setup.py build
-}
-
-prepare() {
- cd ulauncher
- find -iname "*.py" | xargs sed -i 's=\(^#! */usr/bin.*\)python3 *$=\1python='
-}
-
-package() {
- cd ulauncher
- install -Dm644 build/share/applications/ulauncher.desktop "$pkgdir/usr/share/applications/ulauncher.desktop"
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
- rm -rf "$pkgdir"/usr/share/ulauncher/preferences/{no*,src,bow*,gul*,pack*}
- find $pkgdir -type d -name __pycache__ | xargs rm -rf
-}
+++ /dev/null
-pkgbase = update-grub
- pkgdesc = Simple wrapper around grub-mkconfig
- pkgver = 0.0.1
- pkgrel = 7
- url = http://packages.ubuntu.com/precise/grub2-common
- arch = any
- license = GPL2
- depends = grub
- source = update-grub
- sha512sums = 5b61d697f9e101357e2970a05a5f42b2288fcb2c595ee2512b4c9c64e965af4e5d32da24ff6905d8293df516a4477c76655127466d8f1b3cfa2bddea67e84ef5
-
-pkgname = update-grub
-
+++ /dev/null
-pkg/
-src/
-*.tar.xz
-*.tar.gz
+++ /dev/null
-# Maintainer: Max Bruckner
-pkgname=update-grub
-pkgver=0.0.1
-pkgrel=7
-pkgdesc="Simple wrapper around grub-mkconfig"
-arch=('any')
-url='http://packages.ubuntu.com/precise/grub2-common'
-license=('GPL2')
-depends=('grub')
-source=( 'update-grub' )
-sha512sums=('5b61d697f9e101357e2970a05a5f42b2288fcb2c595ee2512b4c9c64e965af4e5d32da24ff6905d8293df516a4477c76655127466d8f1b3cfa2bddea67e84ef5')
-
-package() {
- install -Dm 755 "$srcdir/update-grub" "$pkgdir/usr/bin/update-grub"
-}
+++ /dev/null
-#!/bin/sh
-set -e
-exec grub-mkconfig -o /boot/grub/grub.cfg "$@"
+++ /dev/null
-pkgbase = xfce4-calculator-plugin
- pkgdesc = Calculator plugin for the Xfce4 panel.
- pkgver = 0.7.0
- pkgrel = 1
- url = http://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin
- install = xfce4-calculator-plugin.install
- arch = i686
- arch = x86_64
- license = GPL
- depends = intltool
- depends = xfce4-panel
- source = http://archive.xfce.org/src/panel-plugins/xfce4-calculator-plugin/0.7/xfce4-calculator-plugin-0.7.0.tar.bz2
- sha256sums = 7b50ab947ab058e1c079113e7f0f8b38ef242fec36ec9f31bb4e3c19cb3f9de9
-
-pkgname = xfce4-calculator-plugin
-
+++ /dev/null
-*tar*
-src/*
-pkg/*
+++ /dev/null
-# Maintainer: Bernhard Landauer <oberon@manjaro.org>
-
-pkgname=xfce4-calculator-plugin
-_maj=0.7
-pkgver=$_maj.0
-pkgrel=1
-pkgdesc="Calculator plugin for the Xfce4 panel."
-arch=('i686' 'x86_64')
-url="http://goodies.xfce.org/projects/panel-plugins/$pkgname"
-license=('GPL')
-depends=('intltool' 'xfce4-panel')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/panel-plugins/$pkgname/$_maj/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7b50ab947ab058e1c079113e7f0f8b38ef242fec36ec9f31bb4e3c19cb3f9de9')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib --disable-static
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir/" install
-}
+++ /dev/null
-post_install() {
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
+++ /dev/null
-pkgbase = xfce4-docklike-plugin-git
- pkgdesc = A modern, docklike, minimalist taskbar for XFCE
- pkgver = 20200904
- pkgrel = 1
- url = https://github.com/nsz32/docklike-plugin
- arch = i686
- arch = x86_64
- license = GPL3
- makedepends = git
- makedepends = xfce4-dev-tools
- makedepends = intltool
- depends = xfce4-panel>=4.4
- depends = libwnck3
- depends = libxfce4ui
- depends = gtk3
- depends = cairo
- depends = glib2
- source = git://github.com/nsz32/docklike-plugin
- sha512sums = SKIP
-
-pkgname = xfce4-docklike-plugin-git
-
+++ /dev/null
-# Maintainer: nsz32 <nszabo2 at gmail dot com>
-
-pkgname=xfce4-docklike-plugin-git
-pkgver=20200904
-pkgrel=1
-pkgdesc='A modern, docklike, minimalist taskbar for XFCE'
-arch=('i686' 'x86_64')
-url='https://github.com/nsz32/docklike-plugin'
-license=('GPL3')
-depends=('xfce4-panel>=4.4' 'libwnck3' 'libxfce4ui' 'gtk3' 'cairo' 'glib2')
-makedepends=('git' 'xfce4-dev-tools' 'intltool')
-
-source=(git://github.com/nsz32/docklike-plugin)
-sha512sums=('SKIP')
-
-pkgver() {
- cd "${srcdir}/docklike-plugin"
- git log -1 --format="%cd" --date=short | sed 's|-||g'
-}
-
-prepare() {
- cd "${srcdir}/docklike-plugin"
- ./autogen.sh
-}
-
-build() {
- cd "${srcdir}/docklike-plugin"
- make
-}
-
-package() {
- cd "${srcdir}/docklike-plugin"
- make DESTDIR="${pkgdir}" install
-}
+++ /dev/null
-# Generated by mksrcinfo v8
-# Thu Dec 31 21:23:19 UTC 2015
-pkgbase = b43-firmware
- pkgdesc = Firmware for Broadcom B43 wireless networking chips - latest release
- pkgver = 6.30.163.46
- pkgrel = 1
- url = https://wireless.wiki.kernel.org/en/users/Drivers/b43
- install = b43-firmware.install
- arch = any
- license = unknown
- makedepends = b43-fwcutter>=018
- depends = linux>=3.2
- conflicts = b43-firmware-classic
- options = !emptydirs
- source = http://www.lwfinger.com/b43-firmware/broadcom-wl-6.30.163.46.tar.bz2
- sha1sums = 237d29a7701429054f5c82c000ef2d9aa6f2c3db
-
-pkgname = b43-firmware
-
+++ /dev/null
-# Maintainer: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
-
-pkgname=b43-firmware
-_classic_=${pkgname}-classic
-pkgver=6.30.163.46
-pkgrel=1
-pkgdesc="Firmware for Broadcom B43 wireless networking chips - latest release"
-arch=("any")
-url="https://wireless.wiki.kernel.org/en/users/Drivers/b43"
-license=("unknown")
-depends=("linux>=3.2")
-makedepends=("b43-fwcutter>=018")
-conflicts=(${_classic_})
-install=${pkgname}.install
-options=(!emptydirs)
-source=(http://www.lwfinger.com/${pkgname}/broadcom-wl-${pkgver}.tar.bz2)
-
-package() {
- cd "${srcdir}"
-
- # Directories
- install -d "${pkgdir}"/usr/lib/firmware/
-
- # Application
- b43-fwcutter -w "${pkgdir}"/usr/lib/firmware/ broadcom-wl-${pkgver}.wl_apsta.o
-
- # Messages
- #msg "You should add 'b43' to the 'MODULES' array of your '/etc/rc.conf' file."
-}
-
-sha1sums=('237d29a7701429054f5c82c000ef2d9aa6f2c3db')
+++ /dev/null
-post_upgrade() {
- echo "==> If you encounter problems with v6.30, try the 'b43-firmware-classic' package (v5.100) instead."
-}
-
-post_install() {
- post_upgrade
-}
+++ /dev/null
-# Maintainer: Yamada Hayao <hayao@fascode.net>
-pkgname=eg-installer-scripts-git
-_pkgname=eg-installer-scripts
-pkgver=r1.93e2836
-pkgrel=1
-pkgdesc="zenityとbashで書かれた項目の追加が簡単なパッケージインストーラー"
-arch=('any')
-url=https://github.com/Hayao0819/EG-Installer
-license=('MIT')
-depends=('zenity' 'bash' 'pacman')
-optdepends=('eg-installer: To use those scripts.')
-source=("git+https://github.com/Hayao0819/eg-installer-scripts.git")
-md5sums=('SKIP')
-conflicts=('eg-installer-git')
-
-pkgver() {
- cd "${_pkgname}"
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-
-package() {
- mkdir -p "${pkgdir}/etc/eg-installer/softwares/"
- cp -r "${srcdir}/${_pkgname}/"* "${pkgdir}/etc/eg-installer/softwares/"
-}
-
+++ /dev/null
-pkgbase = gksu
- pkgdesc = A graphical frontend for su
- pkgver = 2.0.2
- pkgrel = 6
- url = http://www.nongnu.org/gksu/index.html
- arch = x86_64
- license = GPL
- makedepends = gtk-doc
- makedepends = intltool
- depends = libgksu>=2.0.12
- depends = xorg-xauth
- source = https://people.debian.org/~kov/gksu/gksu-2.0.2.tar.gz
- sha256sums = a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a
-
-pkgname = gksu
-
+++ /dev/null
-# $Id: PKGBUILD 310007 2017-11-15 14:11:34Z foutrelis $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Eduardo Lopes (eduol@gmx.net)
-
-pkgname=gksu
-pkgver=2.0.2
-pkgrel=6
-pkgdesc="A graphical frontend for su"
-arch=('x86_64')
-url="http://www.nongnu.org/gksu/index.html"
-license=('GPL')
-depends=('libgksu>=2.0.12' 'xorg-xauth')
-makedepends=('gtk-doc' 'intltool')
-source=(https://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static \
- --disable-nautilus-extension
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}/usr/share/applications/"
-}
+++ /dev/null
-pkgbase = libgksu
- pkgdesc = gksu authorization library
- pkgver = 2.0.12
- pkgrel = 8
- url = http://www.nongnu.org/gksu/index.html
- arch = x86_64
- license = GPL
- makedepends = intltool
- makedepends = gtk-doc
- depends = gconf
- depends = gtk2
- depends = libgnome-keyring
- depends = libgtop
- depends = startup-notification
- options = !emptydirs
- source = http://people.debian.org/~kov/gksu/libgksu-2.0.12.tar.gz
- source = libgksu-2.0.0-fbsd.patch
- source = libgksu-2.0.12-automake-1.11.2.patch
- source = libgksu-2.0.12-fix-make-3.82.patch
- source = libgksu-2.0.12-notests.patch
- source = libgksu-2.0.12-revert-forkpty.patch
- source = libgksu-2.0.7-libs.patch
- source = libgksu-2.0.7-polinguas.patch
- md5sums = c7154c8806f791c10e7626ff123049d3
- md5sums = 063a2b45d8e7cbba898d1db413242da0
- md5sums = 2eeb34ad9b5bf29e8e2ebf8c8a5a28b6
- md5sums = afeaf5caab03d793258d62d60a9bf0f0
- md5sums = 4179d0487d6032e56b8a925010694c0a
- md5sums = aebbe57e5286c654e27cf714cf3b704a
- md5sums = 58d3a4a9d2ac741951720043ea3f7b5f
- md5sums = 0b5c3d5d9b32cb3e65d9f0bfbcb11a76
-
-pkgname = libgksu
-
+++ /dev/null
-# $Id: PKGBUILD 310007 2017-11-15 14:11:34Z foutrelis $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgksu
-pkgver=2.0.12
-pkgrel=8
-pkgdesc="gksu authorization library"
-arch=(x86_64)
-url="http://www.nongnu.org/gksu/index.html"
-license=(GPL)
-depends=('gconf' 'gtk2' 'libgnome-keyring' 'libgtop' 'startup-notification')
-makedepends=('intltool' 'gtk-doc')
-options=('!emptydirs')
-source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz
- libgksu-2.0.0-fbsd.patch
- libgksu-2.0.12-automake-1.11.2.patch
- libgksu-2.0.12-fix-make-3.82.patch
- libgksu-2.0.12-notests.patch
- libgksu-2.0.12-revert-forkpty.patch
- libgksu-2.0.7-libs.patch
- libgksu-2.0.7-polinguas.patch)
-md5sums=('c7154c8806f791c10e7626ff123049d3'
- '063a2b45d8e7cbba898d1db413242da0'
- '2eeb34ad9b5bf29e8e2ebf8c8a5a28b6'
- 'afeaf5caab03d793258d62d60a9bf0f0'
- '4179d0487d6032e56b8a925010694c0a'
- 'aebbe57e5286c654e27cf714cf3b704a'
- '58d3a4a9d2ac741951720043ea3f7b5f'
- '0b5c3d5d9b32cb3e65d9f0bfbcb11a76')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/libgksu-2.0.0-fbsd.patch"
- patch -Np1 -i "${srcdir}/libgksu-2.0.7-libs.patch"
- patch -Np1 -i "${srcdir}/libgksu-2.0.7-polinguas.patch"
- patch -Np1 -i "${srcdir}/libgksu-2.0.12-revert-forkpty.patch"
- patch -Np0 -i "${srcdir}/libgksu-2.0.12-fix-make-3.82.patch"
- patch -Np1 -i "${srcdir}/libgksu-2.0.12-notests.patch"
- patch -Np1 -i "${srcdir}/libgksu-2.0.12-automake-1.11.2.patch"
-
- touch NEWS README
-
- intltoolize --force --copy --automake
- autoreconf -fi
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static --disable-schemas-install --disable-gtk-doc
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
- rm -f ${pkgdir}/usr/lib/*.a
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgksu ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
+++ /dev/null
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c
---- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400
-+++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500
-@@ -23,7 +23,12 @@
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
-+#ifdef __FreeBSD__
-+#include <libutil.h>
-+#include <termios.h>
-+#else
- #include <pty.h>
-+#endif
- #include <pwd.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am
---- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400
-+++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500
-@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe
- noinst_PROGRAMS = test-gksu
- test_gksu_SOURCES = test-gksu.c
- test_gksu_LDADD = libgksu2.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-
- EXTRA_DIST = libgksu.ver
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in
---- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400
-+++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500
-@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config --
- gksu_run_helper_SOURCES = gksu-run-helper.c
- test_gksu_SOURCES = test-gksu.c
- test_gksu_LDADD = libgksu2.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
- EXTRA_DIST = libgksu.ver
- all: all-am
-
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am
---- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400
-+++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500
-@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE
- noinst_PROGRAMS = test-gksuui
- test_gksuui_SOURCES = test-gksuui.c
- test_gksuui_LDADD = libgksuui1.0.la
--test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in
---- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400
-+++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500
-@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
- noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
- test_gksuui_SOURCES = test-gksuui.c
- test_gksuui_LDADD = libgksuui1.0.la
--test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
- all: all-am
-
- .SUFFIXES:
+++ /dev/null
-Due to the following change, pkglib_PROGRAMS is invalid:
- http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
-https://savannah.nongnu.org/bugs/index.php?35241
-https://bugs.gentoo.org/show_bug.cgi?id=397411
-
----
- libgksu/Makefile.am | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
-index 49362f9..3cb1090 100644
---- a/libgksu/Makefile.am
-+++ b/libgksu/Makefile.am
-@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE}
- pkgconfigdir = ${libdir}/pkgconfig
- pkgconfig_DATA = libgksu2.pc
-
--pkglibdir = ${libdir}/${PACKAGE}
--pkglib_PROGRAMS = gksu-run-helper
-+gksulibdir = ${libdir}/${PACKAGE}
-+gksulib_PROGRAMS = gksu-run-helper
- gksu_run_helper_LDADD = ${GLIB_LIBS}
- gksu_run_helper_SOURCES = gksu-run-helper.c
-
+++ /dev/null
---- Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500
-+++ Makefile.am 2010-08-22 16:11:55.289599110 -0500
-@@ -17,11 +17,11 @@
-
- if GCONF_SCHEMAS_INSTALL
- install-data-local:
-- if test -z "$(DESTDIR)" ; then \
-- for p in $(schemas_DATA) ; do \
-- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-- done \
-- fi
-+ if test -z "$(DESTDIR)" ; then \
-+ for p in $(schemas_DATA) ; do \
-+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-+ done \
-+ fi
- else
- install-data-local:
- endif
+++ /dev/null
-Index: libgksu-2.0.12/libgksu/Makefile.am
-===================================================================
---- libgksu-2.0.12.orig/libgksu/Makefile.am
-+++ libgksu-2.0.12/libgksu/Makefile.am
-@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper
- gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
- gksu_run_helper_SOURCES = gksu-run-helper.c
-
--noinst_PROGRAMS = test-gksu
-+EXTRA_PROGRAMS = test-gksu
- test_gksu_SOURCES = test-gksu.c
- test_gksu_LDADD = libgksu2.la
- test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-Index: libgksu-2.0.12/libgksuui/Makefile.am
-===================================================================
---- libgksu-2.0.12.orig/libgksuui/Makefile.am
-+++ libgksu-2.0.12/libgksuui/Makefile.am
-@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
- noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
- includedir = ${prefix}/include/$(PACKAGE)
-
--noinst_PROGRAMS = test-gksuui
-+EXTRA_PROGRAMS = test-gksuui
- test_gksuui_SOURCES = test-gksuui.c
- test_gksuui_LDADD = libgksuui1.0.la
- test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
+++ /dev/null
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c
---- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400
-+++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500
-@@ -1,7 +1,6 @@
- /*
- * Gksu -- a library providing access to su functionality
- * Copyright (C) 2004-2009 Gustavo Noronha Silva
-- * Portions Copyright (C) 2009 VMware, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -56,9 +55,6 @@
- static void
- gksu_context_launch_complete (GksuContext *context);
-
--static void
--read_line (int fd, gchar *buffer, int n);
--
- GType
- gksu_error_get_type (void)
- {
-@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context,
- for (i = 0 ; cmd[i] != NULL ; i++)
- g_free (cmd[i]);
- g_free(cmd);
--
-- _exit(1);
- }
- else if (pid == -1)
- {
-@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context,
- /* drop the \n echoed on password entry if su did request
- a password */
- if (password_needed)
-- read_line (fdpty, buf, 255);
-+ read (fdpty, buf, 255);
- if (context->debug)
- fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
-- read_line (fdpty, buf, 255);
-+ read (fdpty, buf, 255);
- if (context->debug)
- fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
- }
-@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context,
- {
- int retval = 0;
-
-- /* Red Hat's su shows the full path to su in its error messages. */
-- if (!strncmp (buf, "su:", 3) ||
-- !strncmp (buf, "/bin/su:", 7))
-+ if (!strncmp (buf, "su", 2))
- {
- gchar **strings;
-
-@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context,
- }
-
- strings = g_strsplit (buf, ":", 2);
--
-- /* Red Hat and Fedora use 'incorrect password'. */
-- if (strings[1] &&
-- (g_str_has_prefix(strings[1], " Authentication failure") ||
-- g_str_has_prefix(strings[1], " incorrect password")))
-+ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23))
- {
- if (used_gnome_keyring)
- g_set_error (error, gksu_quark,
-@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context,
- {
- char **cmd;
- char buffer[256] = {0};
-- char *child_stderr = NULL;
-- /* This command is used to gain a token */
-- char *const verifycmd[] =
-- {
-- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL
-- };
- int argcount = 8;
- int i, j;
-
-@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context,
-
- pid_t pid;
- int status;
-- FILE *fdfile = NULL;
-- int fdpty = -1;
-+ FILE *infile, *outfile;
-+ int parent_pipe[2]; /* For talking to the parent */
-+ int child_pipe[2]; /* For talking to the child */
-
- context->sudo_mode = TRUE;
-
-@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context,
- cmd[argcount] = g_strdup("-S");
- argcount++;
-
-- /* Make sudo noninteractive (we should already have a token) */
-- cmd[argcount] = g_strdup("-n");
-- argcount++;
--
- /* Make sudo use next arg as prompt */
- cmd[argcount] = g_strdup("-p");
- argcount++;
-@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context,
- fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]);
- }
-
-- pid = forkpty(&fdpty, NULL, NULL, NULL);
-- if (pid == 0)
-+ if ((pipe(parent_pipe)) == -1)
- {
-- // Child
-- setsid(); // make us session leader
--
-- execv(verifycmd[0], verifycmd);
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error creating pipe: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
-
-- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
-- _("Failed to exec new process: %s"),
-+ if ((pipe(child_pipe)) == -1)
-+ {
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error creating pipe: %s"),
- strerror(errno));
- sudo_reset_xauth (context, xauth, xauth_env);
- return FALSE;
- }
-- else if (pid == -1)
-+
-+ pid = fork();
-+ if (pid == -1)
- {
- g_set_error (error, gksu_quark, GKSU_ERROR_FORK,
- _("Failed to fork new process: %s"),
-@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context,
- sudo_reset_xauth (context, xauth, xauth_env);
- return FALSE;
- }
-+ else if (pid == 0)
-+ {
-+ // Child
-+ setsid(); // make us session leader
-+ close(child_pipe[1]);
-+ dup2(child_pipe[0], STDIN_FILENO);
-+ dup2(parent_pipe[1], STDERR_FILENO);
-
-+ execv(cmd[0], cmd);
-+
-+ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
-+ _("Failed to exec new process: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
- else
- {
- gint counter = 0;
- gchar *cmdline = NULL;
-- struct termios tio;
-
- // Parent
-- fdfile = fdopen(fdpty, "w+");
-+ close(parent_pipe[1]);
-
-- /* make sure we notice that ECHO is turned off, if it gets
-- turned off */
-- tcgetattr (fdpty, &tio);
-- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++)
-- {
-- usleep (1000);
-- tcgetattr (fdpty, &tio);
-- }
-+ infile = fdopen(parent_pipe[0], "r");
-+ if (!infile)
-+ {
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error opening pipe: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
-
-- fcntl (fdpty, F_SETFL, O_NONBLOCK);
-+ outfile = fdopen(child_pipe[1], "w");
-+ if (!outfile)
-+ {
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error opening pipe: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
-+
-+ /*
-+ we are expecting to receive a GNOME_SUDO_PASS
-+ if we don't there are two possibilities: an error
-+ or a password is not needed
-+ */
-+ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK);
-
- { /* no matter if we can read, since we're using
- O_NONBLOCK; this is just to avoid the prompt
-@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context,
- struct timeval tv;
-
- FD_ZERO(&rfds);
-- FD_SET(fdpty, &rfds);
-+ FD_SET(parent_pipe[0], &rfds);
- tv.tv_sec = 1;
- tv.tv_usec = 0;
-
-- select (fdpty + 1, &rfds, NULL, NULL, &tv);
-+ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv);
- }
-
- /* Try hard to find the prompt; it may happen that we're
-@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context,
- if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0)
- break;
-
-- read_line (fdpty, buffer, 256);
-+ read_line (parent_pipe[0], buffer, 256);
-
- if (context->debug)
- fprintf (stderr, "buffer: -%s-\n", buffer);
-@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context,
-
- usleep (1000);
-
-- write (fdpty, password, strlen(password) + 1);
-- write (fdpty, "\n", 1);
-+ fprintf (outfile, "%s\n", password);
-+ fclose (outfile);
-
- nullify_password (password);
-
-- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
-+ /* turn NONBLOCK off */
-+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
- /* ignore the first newline that comes right after sudo receives
- the password */
-- fgets (buffer, 255, fdfile);
-- /* this is the status we are interested in */
-- fgets (buffer, 255, fdfile);
-+ fgets (buffer, 255, infile);
-+ /* this is the status we are interessted in */
-+ fgets (buffer, 255, infile);
- }
- else
- {
-@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context,
- fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n");
-
- /* turn NONBLOCK off, also if have no prompt */
-- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
-+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
-
- should_display = gconf_client_get_bool (context->gconf_client,
- BASE_PATH "display-no-pass-info", NULL);
-@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context,
- fprintf (stderr, "%s", buffer);
- }
-
-- if (g_str_has_prefix (buffer, "Sorry, try again."))
-+ if (!strcmp (buffer, "Sorry, try again.\n"))
- g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS,
- _("Wrong password."));
-+ else if (!strncmp (buffer, "Sorry, user ", 12))
-+ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
-+ _("The underlying authorization mechanism (sudo) "
-+ "does not allow you to run this program. Contact "
-+ "the system administrator."));
- else
- {
- gchar *haystack = buffer;
-@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context,
- }
- }
-
-- /* If we have an error, let's just stop sudo right there. */
-- if (error)
-- close(fdpty);
--
- cmdline = g_strdup("sudo");
- /* wait for the child process to end or become something other
- than sudo */
-@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context,
- if (context->sn_context)
- gksu_context_launch_complete (context);
-
-+ while (read (parent_pipe[0], buffer, 255) > 0)
-+ {
-+ fprintf (stderr, "%s", buffer);
-+ bzero(buffer, 256);
-+ }
-+
- /* if the process is still active waitpid() on it */
- if (pid_exited != pid)
- waitpid(pid, &status, 0);
- sudo_reset_xauth (context, xauth, xauth_env);
-
-- /*
-- * Did token acquisition succeed? If so, spawn sudo in
-- * non-interactive mode. It should either succeed or die
-- * immediately if you're not allowed to run the command.
-- */
-- if (WEXITSTATUS(status) == 0)
-- {
-- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
-- NULL, &child_stderr, &status,
-- error);
-- }
--
- if (exit_status)
- {
- if (WIFEXITED(status)) {
-@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context,
-
- if (WEXITSTATUS(status))
- {
-- if (g_str_has_prefix(child_stderr, "Sorry, user "))
-- {
-- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
-- _("The underlying authorization mechanism (sudo) "
-- "does not allow you to run this program. Contact "
-- "the system administrator."));
-- }
- if(cmdline)
- {
- /* sudo already exec()ed something else, don't report
-@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context,
- if (!g_str_has_suffix (cmdline, "sudo"))
- {
- g_free (cmdline);
-- g_free (child_stderr);
- return FALSE;
- }
- g_free (cmdline);
-@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context,
- }
- }
-
-- fprintf(stderr, child_stderr);
-- g_free(child_stderr);
--
- /* if error is set we have found an error condition */
-- return (error == NULL);
-+ if (error)
-+ return FALSE;
-+
-+ return TRUE;
- }
-
- /**
+++ /dev/null
-# https://savannah.nongnu.org/bugs/?25362
-# https://bugs.gentoo.org/show_bug.cgi?id=226837
-diff -Nura a/configure.ac b/configure.ac
---- a/configure.ac 2009-01-19 22:15:30.000000000 +0100
-+++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100
-@@ -43,6 +43,9 @@
- PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0])
- PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0])
-
-+PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0])
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0])
-+
- # Checks for library functions.
- ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN"
-
-diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am
---- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100
-+++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100
-@@ -3,7 +3,7 @@
- AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
-
- bin_PROGRAMS = gksu-properties
--gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS}
-+gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS}
- gksu_properties_SOURCES = gksu-properties.c
-
- gladedir = ${prefix}/share/${PACKAGE}
-diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am
---- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100
-+++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100
-@@ -8,8 +8,8 @@
- # major -> breaks backward compatibility (changes to existing ABI)
- # minor -> keeps compatibility (additions to the API)
- # micro -> no change to the API/ABI
--libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
--libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS}
-+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS}
-+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1
- if USE_VERSION_SCRIPT
- libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver
- endif
-@@ -24,12 +24,11 @@
-
- pkglibdir = ${libdir}/${PACKAGE}
- pkglib_PROGRAMS = gksu-run-helper
--gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
-+gksu_run_helper_LDADD = ${GLIB_LIBS}
- gksu_run_helper_SOURCES = gksu-run-helper.c
-
- noinst_PROGRAMS = test-gksu
- test_gksu_SOURCES = test-gksu.c
--test_gksu_LDADD = libgksu2.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-+test_gksu_LDADD = libgksu2.la ${GLIB_LIBS}
-
- EXTRA_DIST = libgksu.ver
-diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am
---- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100
-+++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100
-@@ -4,12 +4,13 @@
-
- noinst_LTLIBRARIES = libgksuui1.0.la
- libgksuui1_0_la_SOURCES = gksuui-dialog.c
--libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0`
-+libgksuui1_0_la_LDFLAGS = -Wl,-O1
-+libgksuui1_0_la_LIBADD = ${GTK_LIBS}
-
- noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
- includedir = ${prefix}/include/$(PACKAGE)
-
- noinst_PROGRAMS = test-gksuui
- test_gksuui_SOURCES = test-gksuui.c
--test_gksuui_LDADD = libgksuui1.0.la
--test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-+test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS}
-+
+++ /dev/null
-# https://savannah.nongnu.org/bugs/?25360
-diff -Nura a/configure.ac b/configure.ac
---- a/configure.ac 2009-01-19 21:50:57.000000000 +0100
-+++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100
-@@ -50,7 +50,7 @@
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
- AC_SUBST(GETTEXT_PACKAGE)
-
--IT_PROG_INTLTOOL
-+IT_PROG_INTLTOOL([0.35.5])
- AM_GLIB_GNU_GETTEXT
-
- ##################################################
-diff -Nura a/po/LINGUAS b/po/LINGUAS
---- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100
-+++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100
-@@ -0,0 +1,23 @@
-+# please keep this list sorted alphabetically
-+# http://live.gnome.org/GnomeGoals/PoLinguas
-+#
-+ca
-+cs
-+da
-+de
-+es
-+eu
-+fr
-+hu
-+it
-+ko
-+lt
-+pl
-+pt_BR
-+ro
-+ru
-+sk
-+sv
-+nb
-+nl
-+zh_CN
+++ /dev/null
-pkgbase = snapd
- pkgdesc = Service and tools for management of snap packages.
- pkgver = 2.47
- pkgrel = 1
- url = https://github.com/snapcore/snapd
- install = snapd.install
- arch = x86_64
- arch = i686
- arch = armv7h
- arch = aarch64
- license = GPL3
- makedepends = git
- makedepends = go
- makedepends = go-tools
- makedepends = libseccomp
- makedepends = libcap
- makedepends = systemd
- makedepends = xfsprogs
- makedepends = python-docutils
- makedepends = apparmor
- depends = squashfs-tools
- depends = libseccomp
- depends = libsystemd
- depends = apparmor
- optdepends = bash-completion: bash completion support
- optdepends = xdg-desktop-portal: desktop integration
- conflicts = snap-confine
- options = !strip
- options = emptydirs
- source = snapd-2.47.tar.xz::https://github.com/snapcore/snapd/releases/download/2.47/snapd_2.47.vendor.tar.xz
- sha256sums = 0e357dcf21acc47307338dd51f178b4e7d8b82a9c5b7d83d933d766217b7c34c
-
-pkgname = snapd
-
+++ /dev/null
-src
-pkg
-snapd-*
-*.pkg.*
+++ /dev/null
-# Maintainer: aimileus <me at aimileus dot nl>
-# Maintainer: Maciej Borzecki <maciek.borzecki@gmail.com>
-# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>
-# Contributor: Zygmunt Krynicki <me at zygoon dot pl>
-
-pkgname=snapd
-pkgdesc="Service and tools for management of snap packages."
-depends=('squashfs-tools' 'libseccomp' 'libsystemd' 'apparmor')
-optdepends=('bash-completion: bash completion support'
- 'xdg-desktop-portal: desktop integration')
-pkgver=2.47
-pkgrel=1
-arch=('x86_64' 'i686' 'armv7h' 'aarch64')
-url="https://github.com/snapcore/snapd"
-license=('GPL3')
-makedepends=('git' 'go' 'go-tools' 'libseccomp' 'libcap' 'systemd' 'xfsprogs' 'python-docutils' 'apparmor')
-conflicts=('snap-confine')
-options=('!strip' 'emptydirs')
-install=snapd.install
-source=("$pkgname-$pkgver.tar.xz::https://github.com/snapcore/${pkgname}/releases/download/${pkgver}/${pkgname}_${pkgver}.vendor.tar.xz")
-sha256sums=('0e357dcf21acc47307338dd51f178b4e7d8b82a9c5b7d83d933d766217b7c34c')
-
-_gourl=github.com/snapcore/snapd
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- export GOPATH="$srcdir/go"
- mkdir -p "$GOPATH"
-
- # Have snapd checkout appear in a place suitable for subsequent GOPATH. This
- # way we don't have to go get it again and it is exactly what the tag/hash
- # above describes.
- mkdir -p "$(dirname "$GOPATH/src/${_gourl}")"
- ln --no-target-directory -fs "$srcdir/$pkgname-$pkgver" "$GOPATH/src/${_gourl}"
-
- for name in "${source[@]}"; do
- if [[ "${name%.patch}" == "$name" ]]; then
- # not a patch
- continue
- fi
- msg2 "applying $name"
- patch -p1 -i "$srcdir/$name"
- done
-}
-
-build() {
- cd "$pkgname-$pkgver"
- export GOPATH="$srcdir/go"
- # snapd does not support modules yet, explicitly disable Go modules
- export GO111MODULE=off
-
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
-
- ./mkversion.sh $pkgver-$pkgrel
-
- # because argument expansion with quoting in bash is hard, and -ldflags=-extldflags='-foo'
- # is not exactly the same as -ldflags "-extldflags '-foo'" use the array trick
- # to pass exactly what we want
- flags=(-buildmode=pie -ldflags "-s -extldflags '$LDFLAGS'" -trimpath)
- staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '$LDFLAGS -static'" -trimpath)
- # Build/install snap and snapd
- go build "${flags[@]}" -o "$srcdir/go/bin/snap" "${_gourl}/cmd/snap"
- go build "${flags[@]}" -o "$srcdir/go/bin/snapd" "${_gourl}/cmd/snapd"
- go build "${flags[@]}" -o "$srcdir/go/bin/snap-seccomp" "${_gourl}/cmd/snap-seccomp"
- go build "${flags[@]}" -o "$srcdir/go/bin/snap-failure" "${_gourl}/cmd/snap-failure"
- # build snap-exec and snap-update-ns completely static for base snaps
- go build "${staticflags[@]}" -o "$srcdir/go/bin/snap-update-ns" "${_gourl}/cmd/snap-update-ns"
- go build "${staticflags[@]}" -o "$srcdir/go/bin/snap-exec" "${_gourl}/cmd/snap-exec"
- go build "${staticflags[@]}" -o "$srcdir/go/bin/snapctl" "${_gourl}/cmd/snapctl"
-
- # Generate data files such as real systemd units, dbus service, environment
- # setup helpers out of the available templates
- make -C data \
- BINDIR=/bin \
- LIBEXECDIR=/usr/lib \
- SYSTEMDSYSTEMUNITDIR=/usr/lib/systemd/system \
- SNAP_MOUNT_DIR=/var/lib/snapd/snap \
- SNAPD_ENVIRONMENT_FILE=/etc/default/snapd
-
- cd cmd
- autoreconf -i -f
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/snapd \
- --with-snap-mount-dir=/var/lib/snapd/snap \
- --enable-apparmor \
- --enable-nvidia-biarch \
- --enable-merged-usr
- make $MAKEFLAGS
-}
-
-check() {
- export GOPATH="$srcdir/go"
- cd "$srcdir/go/src/${_gourl}"
-
- # make sure the binaries that need to be built statically really are
- for binary in snap-exec snap-update-ns snapctl; do
- LC_ALL=C ldd "$srcdir/go/bin/$binary" 2>&1 | grep -q 'not a dynamic executable'
- done
-}
-
-package() {
- cd "$pkgname-$pkgver"
- export GOPATH="$srcdir/go"
- # snapd does not use modules, setting GO111MODULE=on in the environment breaks
- # the build
- unset GO111MODULE
-
- # Install bash completion
- install -Dm644 data/completion/bash/snap \
- "$pkgdir/usr/share/bash-completion/completions/snap"
- install -Dm644 data/completion/bash/complete.sh \
- "$pkgdir/usr/lib/snapd/complete.sh"
- install -Dm644 data/completion/bash/etelpmoc.sh \
- "$pkgdir/usr/lib/snapd/etelpmoc.sh"
- # Install zsh completion
- install -Dm644 data/completion/zsh/_snap \
- "$pkgdir/usr/share/zsh/site-functions/_snap"
-
- # Install systemd units, dbus services and a script for environment variables
- make -C data/ install \
- DBUSSERVICESDIR=/usr/share/dbus-1/services \
- BINDIR=/usr/bin \
- SYSTEMDSYSTEMUNITDIR=/usr/lib/systemd/system \
- SNAP_MOUNT_DIR=/var/lib/snapd/snap \
- DESTDIR="$pkgdir"
- # no tweaks for sudo are needed
- rm -rfv "$pkgdir/etc/sudoers.d"
-
- # Install polkit policy
- install -Dm644 data/polkit/io.snapcraft.snapd.policy \
- "$pkgdir/usr/share/polkit-1/actions/io.snapcraft.snapd.policy"
-
- # Install executables
- install -Dm755 "$srcdir/go/bin/snap" "$pkgdir/usr/bin/snap"
- install -Dm755 "$srcdir/go/bin/snapctl" "$pkgdir/usr/lib/snapd/snapctl"
- install -Dm755 "$srcdir/go/bin/snapd" "$pkgdir/usr/lib/snapd/snapd"
- install -Dm755 "$srcdir/go/bin/snap-seccomp" "$pkgdir/usr/lib/snapd/snap-seccomp"
- install -Dm755 "$srcdir/go/bin/snap-failure" "$pkgdir/usr/lib/snapd/snap-failure"
- install -Dm755 "$srcdir/go/bin/snap-update-ns" "$pkgdir/usr/lib/snapd/snap-update-ns"
- install -Dm755 "$srcdir/go/bin/snap-exec" "$pkgdir/usr/lib/snapd/snap-exec"
- # Ensure /usr/bin/snapctl is a symlink to /usr/libexec/snapd/snapctl
- ln -s /usr/lib/snapd/snapctl "$pkgdir/usr/bin/snapctl"
-
- # pre-create directories
- install -dm755 "$pkgdir/var/lib/snapd/snap"
- install -dm755 "$pkgdir/var/cache/snapd"
- install -dm755 "$pkgdir/var/lib/snapd/apparmor"
- install -dm755 "$pkgdir/var/lib/snapd/assertions"
- install -dm755 "$pkgdir/var/lib/snapd/desktop/applications"
- install -dm755 "$pkgdir/var/lib/snapd/device"
- install -dm755 "$pkgdir/var/lib/snapd/hostfs"
- install -dm755 "$pkgdir/var/lib/snapd/mount"
- install -dm755 "$pkgdir/var/lib/snapd/seccomp/bpf"
- install -dm755 "$pkgdir/var/lib/snapd/snap/bin"
- install -dm755 "$pkgdir/var/lib/snapd/snaps"
- install -dm755 "$pkgdir/var/lib/snapd/inhibit"
- install -dm755 "$pkgdir/var/lib/snapd/lib/gl"
- install -dm755 "$pkgdir/var/lib/snapd/lib/gl32"
- install -dm755 "$pkgdir/var/lib/snapd/lib/vulkan"
- install -dm755 "$pkgdir/var/lib/snapd/lib/glvnd"
- # these dirs have special permissions
- install -dm111 "$pkgdir/var/lib/snapd/void"
- install -dm700 "$pkgdir/var/lib/snapd/cookie"
- install -dm700 "$pkgdir/var/lib/snapd/cache"
-
- make -C cmd install DESTDIR="$pkgdir/"
-
- # Install man file
- mkdir -p "$pkgdir/usr/share/man/man8"
- "$srcdir/go/bin/snap" help --man > "$pkgdir/usr/share/man/man8/snap.8"
-
- # Install the "info" data file with snapd version
- install -m 644 -D "$srcdir/go/src/${_gourl}/data/info" \
- "$pkgdir/usr/lib/snapd/info"
-
- # Remove snappy core specific units
- rm -fv "$pkgdir/usr/lib/systemd/system/snapd.system-shutdown.service"
- rm -fv "$pkgdir/usr/lib/systemd/system/snapd.autoimport.service"
- rm -fv "$pkgdir/usr/lib/systemd/system/snapd.recovery-chooser-trigger.service"
- rm -fv "$pkgdir"/usr/lib/systemd/system/snapd.snap-repair.*
- rm -fv "$pkgdir"/usr/lib/systemd/system/snapd.core-fixup.*
- # and scripts
- rm -fv "$pkgdir/usr/lib/snapd/snapd.core-fixup.sh"
- rm -fv "$pkgdir/usr/bin/ubuntu-core-launcher"
- rm -fv "$pkgdir/usr/lib/snapd/system-shutdown"
-}
+++ /dev/null
-pre_remove() {
- /usr/lib/snapd/snap-mgmt --purge || :
- rm -f /etc/udev/rules.d/70-snap.*.rules || true
- rm -f /etc/dbus-1/system.d/snap.* || true
- rm -f /var/lib/snapd/system-key || true
-}
-
-post_upgrade() {
- # since 2.39+ void permission bits are 111 instead of 000
- chmod 111 /var/lib/snapd/void || true
-}
-
-# vim:set ts=2 sw=2 et:
-
OSDN Git Service
