From bc80cf7c2a23a9d9580f3db36652165fd307b598 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 4 May 2014 03:19:38 +0000 Subject: Sun May 4 03:18:33 UTC 2014 --- community/cinnamon-control-center/PKGBUILD | 8 +- community/cinnamon-desktop/PKGBUILD | 4 +- community/cinnamon-screensaver/PKGBUILD | 8 +- community/cinnamon-screensaver/fix-high-cpu.patch | 22 +----- community/cinnamon-settings-daemon/PKGBUILD | 15 ++-- .../cinnamon-settings-daemon/upower_lid.patch | 28 ------- community/cinnamon/PKGBUILD | 8 +- community/herbstluftwm/PKGBUILD | 35 +++++++++ community/mingw-w64-gcc/PKGBUILD | 8 +- community/muffin/PKGBUILD | 15 ++-- community/muffin/cogl_ABI.patch | 86 ---------------------- community/nemo/PKGBUILD | 8 +- 12 files changed, 71 insertions(+), 174 deletions(-) delete mode 100644 community/cinnamon-settings-daemon/upower_lid.patch create mode 100644 community/herbstluftwm/PKGBUILD delete mode 100644 community/muffin/cogl_ABI.patch (limited to 'community') diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 56fe3657f..c767eb8a9 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 110374 2014-04-28 15:11:32Z jgc $ +# $Id: PKGBUILD 110561 2014-05-03 17:43:28Z faidoc $ # Maintainer: Alexandre Filgueira # Based on gnome-control-center: # Jan Alexander Steffens (heftig) # Jan de Groot pkgname=cinnamon-control-center -pkgver=2.2.3 -pkgrel=3 +pkgver=2.2.4 +pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus' @@ -18,7 +18,7 @@ install=cinnamon-control-center.install license=('GPL') options=('!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") -sha256sums=('50a3da1282f7dcda7a9460aff18873bc83076b74c8dcbe9919e0a372672ae6c9') +sha256sums=('cf3acbe6776398b2aa7b6519f21790c1b8ba7f62487dd062d89fd9f27cfce007') build() { cd $pkgname-$pkgver diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD index ece34c661..331786b65 100644 --- a/community/cinnamon-desktop/PKGBUILD +++ b/community/cinnamon-desktop/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan de Groot pkgname=cinnamon-desktop -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="Library with common API for various Cinnamon modules" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=(intltool gobject-introspection gnome-common) url="https://github.com/linuxmint/cinnamon-desktop" install=cinnamon-desktop.install source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz") -sha256sums=('4f833a3914b7e822c1dd6a495b688d614c4ae6663faa3d0b74d948dae3bcf33b') +sha256sums=('241b9649b6152a8437fe6f6d2174a1a1d2bb790b1087c557273f36a7aed357a1') build() { cd $pkgname-$pkgver diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD index 99cc8ef6e..71e7e026a 100644 --- a/community/cinnamon-screensaver/PKGBUILD +++ b/community/cinnamon-screensaver/PKGBUILD @@ -4,8 +4,8 @@ # Jan de Groot pkgname=cinnamon-screensaver -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.2 +pkgrel=1 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop." arch=('i686' 'x86_64') license=('GPL') @@ -16,8 +16,8 @@ makedepends=('intltool' 'gnome-common') source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz fix-high-cpu.patch cinnamon-screensaver.pam) -sha256sums=('2ba075f8bceb5ff853d76b0426e0d3fedcfd503016c4752f1e5b3813b0d8aef9' - 'e3db1cfeb9a68f0c5a39737a5347add03a68e4316681349f789311403676c8cc' +sha256sums=('6c95f6a1ec8437b63c6b04422527301f4aceeffd3ceb2c034d19bef8deb77333' + '6cb02c9a9df6d4366538b8faffe9d53cf9165871352fe01befb77e8ea92ea736' 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda') prepare() { diff --git a/community/cinnamon-screensaver/fix-high-cpu.patch b/community/cinnamon-screensaver/fix-high-cpu.patch index ea9e5cf8c..965ddc386 100644 --- a/community/cinnamon-screensaver/fix-high-cpu.patch +++ b/community/cinnamon-screensaver/fix-high-cpu.patch @@ -1,24 +1,10 @@ -From b6e44705c0fb68e526ef66d56d26fa677d885193 Mon Sep 17 00:00:00 2001 -From: Corbin -Date: Fri, 18 Apr 2014 17:11:15 -0600 -Subject: [PATCH] Fix sticky screensaver issue - ---- - src/gs-window-x11.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c -index eb4fe5f..127eda5 100644 ---- a/src/gs-window-x11.c -+++ b/src/gs-window-x11.c -@@ -2140,7 +2140,6 @@ shade_background (GtkWidget *widget, +--- cinnamon-screensaver-2.2.2.orig/src/gs-window-x11.c 2014-05-02 10:46:28.000000000 -0500 ++++ cinnamon-screensaver-2.2.2/src/gs-window-x11.c 2014-05-03 13:04:32.024323984 -0500 +@@ -2139,7 +2139,6 @@ { cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.7); cairo_paint (cr); - gs_window_clear_to_background_surface (window); - + gtk_widget_queue_draw (widget); return FALSE; } --- -1.9.1 - diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD index a4ef7ea62..872bf1b07 100644 --- a/community/cinnamon-settings-daemon/PKGBUILD +++ b/community/cinnamon-settings-daemon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110375 2014-04-28 15:11:33Z jgc $ +# $Id: PKGBUILD 110557 2014-05-03 17:35:24Z faidoc $ # Maintainer: Alexandre Filgueira (faidoc) # Contributor: Jan Alexander Steffens (heftig) pkgname=cinnamon-settings-daemon -pkgver=2.2.1 -pkgrel=3 +pkgver=2.2.2 +pkgrel=1 pkgdesc="The Cinnamon Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -14,16 +14,11 @@ makedepends=('intltool' 'docbook-xsl' 'gnome-common' 'xf86-input-wacom') options=('!emptydirs') install=cinnamon-settings-daemon.install url="https://github.com/linuxmint/cinnamon-settings-daemon" -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz" - "upower_lid.patch") -sha256sums=('89798977ad44fa4cfaff26d93e21b29f1a9a6a68a1c57c30e5414ad2159a849e' - '4a94ab880a903c88929ecbfc465cb46aadf30ee14930274fa0eefb7a12f4e3b8') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz") +sha256sums=('4a7f7fdb1ce7d889634bf0f5f5a3391b4209400262037dae899fb5071d3fee61') prepare() { cd $pkgname-$pkgver - - # Fix close lid action with upower 0.99 - patch -Np1 -i ../upower_lid.patch } build() { diff --git a/community/cinnamon-settings-daemon/upower_lid.patch b/community/cinnamon-settings-daemon/upower_lid.patch deleted file mode 100644 index a8f44dae5..000000000 --- a/community/cinnamon-settings-daemon/upower_lid.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/plugins/power/csd-power-manager.c -+++ b/plugins/power/csd-power-manager.c -@@ -2215,7 +2215,11 @@ do_lid_closed_action (CsdPowerManager *m - - - static void -+#if UP_CHECK_VERSION(0,99,0) -+lid_state_changed_cb (UpClient *client, GParamSpec *pspec, CsdPowerManager *manager) -+#else - up_client_changed_cb (UpClient *client, CsdPowerManager *manager) -+#endif - { - gboolean tmp; - -@@ -3967,8 +3971,13 @@ csd_power_manager_start (CsdPowerManager - G_CALLBACK (engine_device_removed_cb), manager); - g_signal_connect (manager->priv->up_client, "device-changed", - G_CALLBACK (engine_device_changed_cb), manager); -+#if UP_CHECK_VERSION(0,99,0) -+ g_signal_connect_after (manager->priv->up_client, "notify::lid-is-closed", -+ G_CALLBACK (lid_state_changed_cb), manager); -+#else - g_signal_connect_after (manager->priv->up_client, "changed", - G_CALLBACK (up_client_changed_cb), manager); -+#endif - - /* use the fallback name from gnome-power-manager so the shell - * blocks this, and uses the power extension instead */ diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index b96d658a7..7a9831c0d 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 109554 2014-04-15 18:16:46Z bgyorgy $ +# $Id: PKGBUILD 110563 2014-05-03 18:04:12Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=2.2.3 -pkgrel=3 +pkgver=2.2.5 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -24,7 +24,7 @@ install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" "upower_calender_fix.patch" "set_wheel.patch") -sha256sums=('9151452f81ffb7edc28cbdb107818f64bb9bd55610711781345418166372f0fe' +sha256sums=('5e5fbfcd942316b83f3c1dc4d3cd7dd73fa9bed7c4af48fee0ae04a878e46d72' 'babfe88a3773f5369b05c7b61d0318cf969b482b9e0c3f281afaf488b0051e53' 'd5d5634b24e56837cb677e62669450c25f79005ed1388584760a131f461180ec') diff --git a/community/herbstluftwm/PKGBUILD b/community/herbstluftwm/PKGBUILD new file mode 100644 index 000000000..6a1402899 --- /dev/null +++ b/community/herbstluftwm/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 110572 2014-05-03 22:05:47Z jsteel $ +# Maintainer: Jonathan Steel +# Contributor: thorsten w. + +pkgname=herbstluftwm +pkgver=0.6.2 +pkgrel=2 +pkgdesc="Manual tiling window manager for X" +arch=('i686' 'x86_64') +url="http://herbstluftwm.org" +license=('BSD') +depends=('glib2' 'libxinerama') +optdepends=('xsetroot: to set wallpaper color in default autostart' + 'xterm: used as the terminal in default autostart' + 'dzen2: used in the default panel.sh' + 'dmenu: used in some example scripts') +source=($url/tarballs/$pkgname-$pkgver.tar.gz) +md5sums=('8bfbbdb16cf88821c8dacd5165590fd2') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + TERM=linux make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make PREFIX=/usr DESTDIR="$pkgdir"/ install + + install -d "$pkgdir"/usr/share/licenses/$pkgname/ + + ln -s /usr/share/doc/$pkgname/LICENSE \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community/mingw-w64-gcc/PKGBUILD b/community/mingw-w64-gcc/PKGBUILD index c89263432..3425a8532 100644 --- a/community/mingw-w64-gcc/PKGBUILD +++ b/community/mingw-w64-gcc/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 105245 2014-02-03 11:09:14Z spupykin $ +# $Id: PKGBUILD 110564 2014-05-03 18:08:45Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: rubenvb vanboxem ruben gmail com _targets="i686-w64-mingw32 x86_64-w64-mingw32" pkgname=mingw-w64-gcc -pkgver=4.8.2 -pkgrel=5 +pkgver=4.9.0 +pkgrel=1 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler" arch=('i686' 'x86_64') url="http://gcc.gnu.org" @@ -23,7 +23,7 @@ backup=() options=('!strip' 'staticlibs' '!emptydirs' '!buildflags') source=("ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2" 'gcc-make-xmmintrin-header-cplusplus-compatible.patch') -md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d' +md5sums=('9709b49ae0e904cbb0a6a1b62853b556' 'da6c9ba6baebe1286f3219d4181cdbb8') prepare() { diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 99f4e2aa6..02974536a 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 109803 2014-04-19 00:45:07Z bgyorgy $ +# $Id: PKGBUILD 110555 2014-05-03 17:27:50Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=2.2.1 -pkgrel=2 +pkgver=2.2.2 +pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -15,16 +15,11 @@ depends=('clutter' 'gobject-introspection' 'cinnamon-desktop' 'libcanberra' 'lib makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!emptydirs') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" - cogl_ABI.patch) -sha256sums=('aec5062ca53364e5077694ef0848b7a4efe384f19d41736c2f7d86e53ce5c009' - 'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz") +sha256sums=('1f39bb8d76ed0fa5704c5cb336ea86e6871396e92fca8a1ff0671be0b4d30739') prepare() { cd ${pkgname}-${pkgver} - - # Port to cogl 1.18 - patch -Np1 -i ../cogl_ABI.patch } build() { diff --git a/community/muffin/cogl_ABI.patch b/community/muffin/cogl_ABI.patch deleted file mode 100644 index 408b1d9dd..000000000 --- a/community/muffin/cogl_ABI.patch +++ /dev/null @@ -1,86 +0,0 @@ -From d2a1db8834bf0a9007bf6924b006a6f2c94ce88d Mon Sep 17 00:00:00 2001 -From: Jasper St. Pierre -Date: Mon, 13 Jan 2014 18:03:19 +0000 -Subject: Update for Cogl API breaks - ---- -(limited to 'src/compositor') - -diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c -index 3fc9430..450155d 100644 ---- a/src/compositor/meta-texture-rectangle.c -+++ b/src/compositor/meta-texture-rectangle.c -@@ -35,10 +35,8 @@ CoglTexture * - meta_texture_rectangle_new (unsigned int width, - unsigned int height, - CoglPixelFormat format, -- CoglPixelFormat internal_format, - unsigned int rowstride, -- const guint8 *data, -- GError **error) -+ const guint8 *data) - { - ClutterBackend *backend = - clutter_get_default_backend (); -@@ -46,10 +44,7 @@ meta_texture_rectangle_new (unsigned int width, - clutter_backend_get_cogl_context (backend); - CoglTextureRectangle *tex_rect; - -- tex_rect = cogl_texture_rectangle_new_with_size (context, -- width, height, -- internal_format, -- error); -+ tex_rect = cogl_texture_rectangle_new_with_size (context, width, height); - if (tex_rect == NULL) - return NULL; - -diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h -index 30f60d3..7b84229 100644 ---- a/src/compositor/meta-texture-rectangle.h -+++ b/src/compositor/meta-texture-rectangle.h -@@ -34,10 +34,8 @@ CoglTexture * - meta_texture_rectangle_new (unsigned int width, - unsigned int height, - CoglPixelFormat format, -- CoglPixelFormat internal_format, - unsigned int rowstride, -- const guint8 *data, -- GError **error); -+ const guint8 *data); - - gboolean - meta_texture_rectangle_check (CoglTexture *texture); -diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c -index 9a30de0..019aaf4 100644 ---- a/src/compositor/meta-texture-tower.c -+++ b/src/compositor/meta-texture-tower.c -@@ -365,13 +365,9 @@ texture_tower_create_texture (MetaTextureTower *tower, - meta_texture_rectangle_new (width, height, - /* data format */ - TEXTURE_FORMAT, -- /* internal cogl format */ -- TEXTURE_FORMAT, - /* rowstride */ - width * 4, - /* data */ -- NULL, -- /* error */ - NULL); - } - else ---- a/src/compositor/meta-shaped-texture.c -+++ b/src/compositor/meta-shaped-texture.c -@@ -295,10 +295,7 @@ meta_shaped_texture_ensure_mask (MetaSha - if (meta_texture_rectangle_check (paint_tex)) - priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height, - COGL_PIXEL_FORMAT_A_8, -- COGL_PIXEL_FORMAT_A_8, -- stride, -- mask_data, -- NULL /* error */); -+ stride, mask_data); - else - priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height, - COGL_TEXTURE_NONE, --- -cgit v0.9.2 diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 934c5b2d5..f111feb4d 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109531 2014-04-15 13:28:34Z bgyorgy $ +# $Id: PKGBUILD 110568 2014-05-03 18:14:08Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.1 +pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" @@ -17,7 +17,7 @@ options=('!emptydirs') install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" "adwaita_style.patch") -sha256sums=('d909354fb5378804eb9abcfe04e3f4b4e482e7afbec018cacc35b3e845cce466' +sha256sums=('c0bc5cc0340a99bca8eab3f8312839f8d3e96cf29326ded919c948781694c2d3' '6faa6a5a7042832fb1230a5d21ebe8572c100798e724fcd72fee86dc01d69290') prepare() { -- cgit v1.2.3-54-g00ecf