[tlp] Year typo
by mystro256
commit 54132b693796b5cc192f9fbea4494ef1b1cf513f
Author: Jeremy Newton <alexjnewt(a)hotmail.com>
Date: Sat Jan 31 18:44:51 2015 -0500
Year typo
tlp.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/tlp.spec b/tlp.spec
index df5dacd..c3f7de3 100644
--- a/tlp.spec
+++ b/tlp.spec
@@ -104,7 +104,7 @@ install -D -m 644 tlp-sleep.service %{buildroot}%{_unitdir}/tlp-sleep.service
/bin/systemctl enable NetworkManager-dispatcher.service >/dev/null 2>&1 || :
%changelog
-* Sat Jan 31 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 0.7-1
+* Sat Jan 31 2015 Jeremy Newton <alexjnewt(a)hotmail.com> - 0.7-1
- New Version
* Mon Nov 17 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 0.6-3
8Â years, 10Â months
[tlp] New version
by mystro256
commit 64e3a0ba30072b2884b65ad8a2c8867bb8f3f9d0
Author: Jeremy Newton <alexjnewt(a)hotmail.com>
Date: Sat Jan 31 18:42:09 2015 -0500
New version
.gitignore | 1 +
sources | 2 +-
tlp.spec | 8 ++++++--
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17b2d9f..80a453a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/0.5.tar.gz
/0.6.tar.gz
+/0.7.tar.gz
diff --git a/sources b/sources
index f528570..ba690c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52f25c3459f6d9ce31cd2e67a5fcc5e0 0.6.tar.gz
+660ee2e507c02f11c62d70ff4ca8329c 0.7.tar.gz
diff --git a/tlp.spec b/tlp.spec
index efcc74e..df5dacd 100644
--- a/tlp.spec
+++ b/tlp.spec
@@ -1,6 +1,6 @@
Name: tlp
-Version: 0.6
-Release: 3%{?dist}
+Version: 0.7
+Release: 1%{?dist}
Summary: Advanced power management tool for Linux
License: GPLv2+
URL: http://linrunner.de/tlp
@@ -18,6 +18,7 @@ Requires: systemd
Requires: udev
Requires: usbutils
Requires: pciutils
+Requires: kernel-tools
#Conflicts with laptop-mode-tools, note that an official
#package/package name doesn't exist, so this works for now:
Conflicts: %{_sbindir}/laptop_mode
@@ -103,6 +104,9 @@ install -D -m 644 tlp-sleep.service %{buildroot}%{_unitdir}/tlp-sleep.service
/bin/systemctl enable NetworkManager-dispatcher.service >/dev/null 2>&1 || :
%changelog
+* Sat Jan 31 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 0.7-1
+- New Version
+
* Mon Nov 17 2014 Jeremy Newton <alexjnewt(a)hotmail.com> - 0.6-3
- Wireless-tools removed as a dependency
8Â years, 10Â months
[xorg-x11-server/f21] fix C++ region init for vnc building (try 2)
by Dave Airlie
commit 06dc71ecf0743e913e57dca480469b123446908a
Author: Dave Airlie <airlied(a)gmail.com>
Date: Sun Feb 1 09:18:23 2015 +1000
fix C++ region init for vnc building (try 2)
xorg-x11-server.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 65a86d8..ce35916 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -42,7 +42,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.16.3
-Release: 1%{?gitdate:.%{gitdate}}%{dist}
+Release: 2%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -105,6 +105,7 @@ Patch10250: 0001-dix-Allow-zero-height-PutImage-requests.patch
Patch10300: glamor-add-shm-sync-fence-support.patch
Patch10301: 0001-randr-attempt-to-fix-primary-on-slave-output-v2.patch
Patch10302: 0002-config-udev-Respect-seat-assignments-when-assigned-d.patch
+Patch10303: 0001-dix-make-RegionInit-legal-C.patch
%global moduledir %{_libdir}/xorg/modules
%global drimoduledir %{_libdir}/dri
@@ -644,6 +645,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%changelog
+* Sun Feb 01 2015 Dave Airlie <airlied(a)redhat.com> 1.16.3-2
+- fix C++ region init for vnc building
+
* Sun Feb 01 2015 Dave Airlie <airlied(a)redhat.com 1.16.3-1
- upstream release 1.16.3 + two backport fixes
8Â years, 10Â months
[xorg-x11-server/f21] fix C++ region init for vnc building
by Dave Airlie
commit 8f555ae470cfdd2d1f749793ff63a812157f90c4
Author: Dave Airlie <airlied(a)gmail.com>
Date: Sun Feb 1 09:18:23 2015 +1000
fix C++ region init for vnc building
0001-dix-make-RegionInit-legal-C.patch | 45 ++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
---
diff --git a/0001-dix-make-RegionInit-legal-C.patch b/0001-dix-make-RegionInit-legal-C.patch
new file mode 100644
index 0000000..d8a89a3
--- /dev/null
+++ b/0001-dix-make-RegionInit-legal-C.patch
@@ -0,0 +1,45 @@
+From 764ef8dcf24c78bad3480e97b65e2ea7fc4afcd5 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax(a)redhat.com>
+Date: Mon, 5 Jan 2015 16:48:11 -0500
+Subject: [PATCH] dix: make RegionInit legal C++
+
+The CVE fix in:
+
+ commit 97015a07b9e15d8ec5608b95d95ec0eb51202acb
+ Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+ Date: Wed Jan 22 22:37:15 2014 -0800
+
+ dix: integer overflow in RegionSizeof() [CVE-2014-8092 3/4]
+
+offended the C++ demons:
+
+../../include/regionstr.h:147:45: error: invalid conversion from 'void*' to
+'pixman_region16_data_t* {aka pixman_region16_data*}' [-fpermissive]
+
+Normally this isn't a problem, because around here we have the sense and
+common decency to not use C++, but this does make tigervnc fail to build,
+which is a little rude of us.
+
+Signed-off-by: Adam Jackson <ajax(a)redhat.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Signed-off-by: Keith Packard <keithp(a)keithp.com>
+---
+ include/regionstr.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/regionstr.h b/include/regionstr.h
+index 33df87f..00343f2 100644
+--- a/include/regionstr.h
++++ b/include/regionstr.h
+@@ -144,7 +144,7 @@ RegionInit(RegionPtr _pReg, BoxPtr _rect, int _size)
+ size_t rgnSize;
+ (_pReg)->extents = RegionEmptyBox;
+ if (((_size) > 1) && ((rgnSize = RegionSizeof(_size)) > 0) &&
+- (((_pReg)->data = malloc(rgnSize)) != NULL)) {
++ (((_pReg)->data = (RegDataPtr) malloc(rgnSize)) != NULL)) {
+ (_pReg)->data->size = (_size);
+ (_pReg)->data->numRects = 0;
+ }
+--
+2.1.0
+
8Â years, 10Â months
[xorg-x11-server/f21] upstream release 1.16.3 + two backport fixes
by Dave Airlie
commit e9e6351ba7aa68dc494c79dcad9e093a32a040b4
Author: Dave Airlie <airlied(a)gmail.com>
Date: Sun Feb 1 09:09:26 2015 +1000
upstream release 1.16.3 + two backport fixes
0001-dix-Allow-zero-height-PutImage-requests.patch | 34 +++++
...attempt-to-fix-primary-on-slave-output-v2.patch | 146 ++++++++++++++++++++
...-Respect-seat-assignments-when-assigned-d.patch | 86 ++++++++++++
sources | 2 +-
xorg-x11-server.spec | 10 ++-
5 files changed, 276 insertions(+), 2 deletions(-)
---
diff --git a/0001-dix-Allow-zero-height-PutImage-requests.patch b/0001-dix-Allow-zero-height-PutImage-requests.patch
new file mode 100644
index 0000000..757d8b8
--- /dev/null
+++ b/0001-dix-Allow-zero-height-PutImage-requests.patch
@@ -0,0 +1,34 @@
+From f39ac527baab8a38d023e3a8416757ccfcead42a Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp(a)keithp.com>
+Date: Sat, 3 Jan 2015 08:46:45 -0800
+Subject: [PATCH] dix: Allow zero-height PutImage requests
+
+The length checking code validates PutImage height and byte width by
+making sure that byte-width >= INT32_MAX / height. If height is zero,
+this generates a divide by zero exception. Allow zero height requests
+explicitly, bypassing the INT32_MAX check.
+
+Signed-off-by: Keith Packard <keithp(a)keithp.com>
+Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+(cherry picked from commit dc777c346d5d452a53b13b917c45f6a1bad2f20b)
+Signed-off-by: Julien Cristau <jcristau(a)debian.org>
+---
+ dix/dispatch.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dix/dispatch.c b/dix/dispatch.c
+index 01820bc..4e24e62 100644
+--- a/dix/dispatch.c
++++ b/dix/dispatch.c
+@@ -1956,7 +1956,7 @@ ProcPutImage(ClientPtr client)
+ tmpImage = (char *) &stuff[1];
+ lengthProto = length;
+
+- if (lengthProto >= (INT32_MAX / stuff->height))
++ if (stuff->height != 0 && lengthProto >= (INT32_MAX / stuff->height))
+ return BadLength;
+
+ if ((bytes_to_int32(lengthProto * stuff->height) +
+--
+2.1.0
+
diff --git a/0001-randr-attempt-to-fix-primary-on-slave-output-v2.patch b/0001-randr-attempt-to-fix-primary-on-slave-output-v2.patch
new file mode 100644
index 0000000..1e272d9
--- /dev/null
+++ b/0001-randr-attempt-to-fix-primary-on-slave-output-v2.patch
@@ -0,0 +1,146 @@
+From b3ef430c7896db4d3bd1249d5341342424532539 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied(a)redhat.com>
+Date: Wed, 7 Jan 2015 09:19:27 +1000
+Subject: [PATCH 1/2] randr: attempt to fix primary on slave output (v2)
+
+If the user wants to set one of the slave devices as
+the primary output, we shouldn't fail to do so,
+we were returning BadMatch which was tripping up
+gnome-settings-daemon and bad things ensues.
+
+Fix all the places we use primaryOutput to work
+out primaryCrtc and take it into a/c when slave
+gpus are in use.
+
+v2: review from Aaron, fix indent, unhide has_primary from
+macro. I left the int vs Bool alone to be consistent with
+code below, a future patch could fix both.
+
+Signed-off-by: Dave Airlie <airlied(a)redhat.com>
+Reviewed-by: Aaron Plattner <aplattner(a)nvidia.com>
+Signed-off-by: Keith Packard <keithp(a)keithp.com>
+---
+ randr/rroutput.c | 6 +++++-
+ randr/rrscreen.c | 22 ++++++++++++++++++----
+ randr/rrxinerama.c | 12 ++++++++++--
+ 3 files changed, 33 insertions(+), 7 deletions(-)
+
+diff --git a/randr/rroutput.c b/randr/rroutput.c
+index f824f50..1649309 100644
+--- a/randr/rroutput.c
++++ b/randr/rroutput.c
+@@ -540,7 +540,11 @@ ProcRRSetOutputPrimary(ClientPtr client)
+ if (stuff->output) {
+ VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
+
+- if (output->pScreen != pWin->drawable.pScreen) {
++ if (!output->pScreen->isGPU && output->pScreen != pWin->drawable.pScreen) {
++ client->errorValue = stuff->window;
++ return BadMatch;
++ }
++ if (output->pScreen->isGPU && output->pScreen->current_master != pWin->drawable.pScreen) {
+ client->errorValue = stuff->window;
+ return BadMatch;
+ }
+diff --git a/randr/rrscreen.c b/randr/rrscreen.c
+index 36179ae..e7ea49d 100644
+--- a/randr/rrscreen.c
++++ b/randr/rrscreen.c
+@@ -322,8 +322,13 @@ static inline void swap_modeinfos(xRRModeInfo *modeinfos, int i)
+ swapl(&modeinfos[i].modeFlags);
+ }
+
+-#define update_arrays(gpuscreen, pScrPriv) do { \
++#define update_arrays(gpuscreen, pScrPriv, primary_crtc, has_primary) do { \
+ for (j = 0; j < pScrPriv->numCrtcs; j++) { \
++ if (has_primary && \
++ primary_crtc == pScrPriv->crtcs[j]) { \
++ has_primary = 0; \
++ continue; \
++ }\
+ crtcs[crtc_count] = pScrPriv->crtcs[j]->id; \
+ if (client->swapped) \
+ swapl(&crtcs[crtc_count]); \
+@@ -366,9 +371,11 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen)
+ unsigned long extraLen;
+ CARD8 *extra;
+ RRCrtc *crtcs;
++ RRCrtcPtr primary_crtc = NULL;
+ RROutput *outputs;
+ xRRModeInfo *modeinfos;
+ CARD8 *names;
++ int has_primary = 0;
+
+ /* we need to iterate all the GPU masters and all their output slaves */
+ total_crtcs = 0;
+@@ -426,18 +433,25 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen)
+ modeinfos = (xRRModeInfo *)(outputs + total_outputs);
+ names = (CARD8 *)(modeinfos + total_modes);
+
+- /* TODO primary */
+ crtc_count = 0;
+ output_count = 0;
+ mode_count = 0;
+
+ pScrPriv = rrGetScrPriv(pScreen);
+- update_arrays(pScreen, pScrPriv);
++ if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc) {
++ has_primary = 1;
++ primary_crtc = pScrPriv->primaryOutput->crtc;
++ crtcs[0] = pScrPriv->primaryOutput->crtc->id;
++ if (client->swapped)
++ swapl(&crtcs[0]);
++ crtc_count = 1;
++ }
++ update_arrays(pScreen, pScrPriv, primary_crtc, has_primary);
+
+ xorg_list_for_each_entry(iter, &pScreen->output_slave_list, output_head) {
+ pScrPriv = rrGetScrPriv(iter);
+
+- update_arrays(iter, pScrPriv);
++ update_arrays(iter, pScrPriv, primary_crtc, has_primary);
+ }
+
+ assert(bytes_to_int32((char *) names - (char *) extra) == rep.length);
+diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
+index 76d728c..363cead 100644
+--- a/randr/rrxinerama.c
++++ b/randr/rrxinerama.c
+@@ -344,15 +344,17 @@ ProcRRXineramaQueryScreens(ClientPtr client)
+ ScreenPtr slave;
+ rrScrPriv(pScreen);
+ int has_primary = 0;
++ RRCrtcPtr primary_crtc = NULL;
+
+ if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc) {
+ has_primary = 1;
++ primary_crtc = pScrPriv->primaryOutput->crtc;
+ RRXineramaWriteCrtc(client, pScrPriv->primaryOutput->crtc);
+ }
+
+ for (i = 0; i < pScrPriv->numCrtcs; i++) {
+ if (has_primary &&
+- pScrPriv->primaryOutput->crtc == pScrPriv->crtcs[i]) {
++ primary_crtc == pScrPriv->crtcs[i]) {
+ has_primary = 0;
+ continue;
+ }
+@@ -362,8 +364,14 @@ ProcRRXineramaQueryScreens(ClientPtr client)
+ xorg_list_for_each_entry(slave, &pScreen->output_slave_list, output_head) {
+ rrScrPrivPtr pSlavePriv;
+ pSlavePriv = rrGetScrPriv(slave);
+- for (i = 0; i < pSlavePriv->numCrtcs; i++)
++ for (i = 0; i < pSlavePriv->numCrtcs; i++) {
++ if (has_primary &&
++ primary_crtc == pSlavePriv->crtcs[i]) {
++ has_primary = 0;
++ continue;
++ }
+ RRXineramaWriteCrtc(client, pSlavePriv->crtcs[i]);
++ }
+ }
+ }
+
+--
+2.1.0
+
diff --git a/0002-config-udev-Respect-seat-assignments-when-assigned-d.patch b/0002-config-udev-Respect-seat-assignments-when-assigned-d.patch
new file mode 100644
index 0000000..e2ba03b
--- /dev/null
+++ b/0002-config-udev-Respect-seat-assignments-when-assigned-d.patch
@@ -0,0 +1,86 @@
+From c38c1f7e76b3ec85404c7897ce2aadb28645198c Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied(a)redhat.com>
+Date: Fri, 30 Jan 2015 09:59:49 +1000
+Subject: [PATCH 2/2] config/udev: Respect seat assignments when assigned
+ devices
+
+Jonathan Dieter posted a few patches to do this inside the Xorg
+server but it makes no sense to do it there, just have the code
+we use to probe the device list at startup check seat assignments
+using the same code we check at hotplug time.
+
+Bugilla: https://bugzilla.redhat.com/show_bug.cgi?id=1183654
+Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+Acked-by: Hans de Goede <hdegoede(a)redhat.com>
+Tested-by: Jonathan Dieter <jdieter(a)lesbg.com>
+Signed-off-by: Dave Airlie <airlied(a)redhat.com>
+Signed-off-by: Keith Packard <keithp(a)keithp.com>
+---
+ config/udev.c | 30 +++++++++++++++++++++---------
+ 1 file changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/config/udev.c b/config/udev.c
+index a1b72c1..71215af 100644
+--- a/config/udev.c
++++ b/config/udev.c
+@@ -69,6 +69,24 @@ static const char *itoa(int i)
+ return itoa_buf;
+ }
+
++static Bool
++check_seat(struct udev_device *udev_device)
++{
++ const char *dev_seat;
++
++ dev_seat = udev_device_get_property_value(udev_device, "ID_SEAT");
++ if (!dev_seat)
++ dev_seat = "seat0";
++
++ if (SeatId && strcmp(dev_seat, SeatId))
++ return FALSE;
++
++ if (!SeatId && strcmp(dev_seat, "seat0"))
++ return FALSE;
++
++ return TRUE;
++}
++
+ static void
+ device_added(struct udev_device *udev_device)
+ {
+@@ -83,7 +101,6 @@ device_added(struct udev_device *udev_device)
+ struct udev_list_entry *set, *entry;
+ struct udev_device *parent;
+ int rc;
+- const char *dev_seat;
+ dev_t devnum;
+
+ path = udev_device_get_devnode(udev_device);
+@@ -93,14 +110,7 @@ device_added(struct udev_device *udev_device)
+ if (!path || !syspath)
+ return;
+
+- dev_seat = udev_device_get_property_value(udev_device, "ID_SEAT");
+- if (!dev_seat)
+- dev_seat = "seat0";
+-
+- if (SeatId && strcmp(dev_seat, SeatId))
+- return;
+-
+- if (!SeatId && strcmp(dev_seat, "seat0"))
++ if (!check_seat(udev_device))
+ return;
+
+ devnum = udev_device_get_devnum(udev_device);
+@@ -506,6 +516,8 @@ config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback)
+ goto no_probe;
+ else if (strncmp(sysname, "card", 4) != 0)
+ goto no_probe;
++ else if (!check_seat(udev_device))
++ goto no_probe;
+
+ config_udev_odev_setup_attribs(path, syspath, major(devnum),
+ minor(devnum), probe_callback);
+--
+2.1.0
+
diff --git a/sources b/sources
index 8919c54..c5a2d0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82cbcf6755787962e943d8e23495358d xorg-server-1.16.2.901.tar.bz2
+afd93977235584a9caa7528a737c1b52 xorg-server-1.16.3.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 2087984..65a86d8 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -41,7 +41,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.16.2.901
+Version: 1.16.3
Release: 1%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
@@ -99,8 +99,13 @@ Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
# submitted http://lists.x.org/archives/xorg-devel/2014-July/042936.html
Patch10200: 0001-xwayland-Snap-damage-reports-to-the-bounding-box.patch
+# alread in stable
+Patch10250: 0001-dix-Allow-zero-height-PutImage-requests.patch
# already in master:
Patch10300: glamor-add-shm-sync-fence-support.patch
+Patch10301: 0001-randr-attempt-to-fix-primary-on-slave-output-v2.patch
+Patch10302: 0002-config-udev-Respect-seat-assignments-when-assigned-d.patch
+
%global moduledir %{_libdir}/xorg/modules
%global drimoduledir %{_libdir}/dri
%global sdkdir %{_includedir}/xorg
@@ -639,6 +644,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%changelog
+* Sun Feb 01 2015 Dave Airlie <airlied(a)redhat.com 1.16.3-1
+- upstream release 1.16.3 + two backport fixes
+
* Wed Dec 10 2014 Dave Airlie <airlied(a)redhat.com> 1.16.2.901-1
- upstream security release. 1.16.2.901
8Â years, 10Â months
[lightdm-gtk] add badges for Mate and Window Maker (#1178498)
by Rex Dieter
commit 77ea073e28233c78fcafebdade1ad5ab552046a6
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Sat Jan 31 16:33:12 2015 -0600
add badges for Mate and Window Maker (#1178498)
lightdm-gtk-greeter-1.9.1-badges.patch | 48 ++++++++++++++++++++++++++++++++
lightdm-gtk.spec | 9 +++++-
2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/lightdm-gtk-greeter-1.9.1-badges.patch b/lightdm-gtk-greeter-1.9.1-badges.patch
new file mode 100644
index 0000000..e969624
--- /dev/null
+++ b/lightdm-gtk-greeter-1.9.1-badges.patch
@@ -0,0 +1,48 @@
+=== added file 'data/badges/mate_badge-symbolic.svg'
+--- data/badges/mate_badge-symbolic.svg 1970-01-01 00:00:00 +0000
++++ data/badges/mate_badge-symbolic.svg 2014-12-05 15:47:23 +0000
+@@ -0,0 +1,24 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
++ <metadata id="metadata7">
++ <rdf:RDF>
++ <cc:Work rdf:about="">
++ <dc:format>image/svg+xml</dc:format>
++ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
++ <dc:title/>
++ </cc:Work>
++ </rdf:RDF>
++ </metadata>
++ <g id="layer2" display="none" transform="translate(0,-6)">
++ <rect id="rect4898" fill-rule="nonzero" height="22" width="22" y="0" x="0" fill="#333"/>
++ </g>
++ <g id="layer3" display="none" transform="translate(0,-6)">
++ <rect id="rect4126" fill-rule="nonzero" height="22" width="22" y="0" x="0" fill="#efebe7"/>
++ </g>
++ <g id="layer1" transform="matrix(1.0319689,0,0,1.0563566,-0.69397664,-6.778957)" stroke-miterlimit="4" stroke-width="0" fill="#bebebe">
++ <path id="path5070" fill-rule="evenodd" d="m1.6415,10.204,6.7832,3.7866-6.7832,3.7866z"/>
++ <path id="path5067" d="m15.208,13.991c0-3.658-3.131-6.6271-6.7834-6.6271-2.109,0-4.1361,1.0094-5.348,2.5503l0.85177,0.47616c1.034-1.2658,2.7359-2.0798,4.4963-2.0798,3.1115-1E-7,5.8141,2.5683,5.8141,5.6799,0,3.1115-2.7025,5.6799-5.8141,5.6799-1.7553,0-3.5475-0.92376-4.5815-2.183l-0.84886,0.47427c1.2122,1.5345,3.3264,2.6554,5.4304,2.6554,3.6524,0,6.7832-2.9686,6.7832-6.6266z"/>
++ <path id="path5648" d="m12.301,13.99c0-2.2361-1.64-3.7866-3.8761-3.7866-1.1905,0-2.0368,0.32699-2.7782,1.1454l0.8789,0.49036c0.55229-0.54547,1.065-0.68916,1.8993-0.68916,1.6896,0,2.9071,1.1392,2.9071,2.84s-1.2175,2.84-2.9071,2.84c-0.84982,0-1.4491-0.21841-2.0039-0.78193l-0.86824,0.48468c0.74137,0.81851,1.6817,1.2439,2.8722,1.2439,2.2361,0,3.8761-1.5505,3.8761-3.7866z"/>
++ </g>
++</svg>
+
+=== added file 'data/badges/wmaker-common_badge-symbolic.svg'
+--- data/badges/wmaker-common_badge-symbolic.svg 1970-01-01 00:00:00 +0000
++++ data/badges/wmaker-common_badge-symbolic.svg 2014-12-05 15:47:23 +0000
+@@ -0,0 +1,14 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
++<svg id="svg888" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
++ <metadata id="metadata10">
++ <rdf:RDF>
++ <cc:Work rdf:about="">
++ <dc:format>image/svg+xml</dc:format>
++ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
++ <dc:title/>
++ </cc:Work>
++ </rdf:RDF>
++ </metadata>
++ <path id="path148" d="M8,1c-3.8429,0-7,3.157-7,7,0,1.77,0.9107,3.7715,2,5h3v-5h4v-5h3c-1.274-1.4009-2.959-2-5-2zm5,2c1.1245,1.2366,2,3.1982,2,5,0,3.8428-3.157,7-7,7-2.073,0-3.7242-0.56089-5-2h-2v2h14v-12h-2z" fill-rule="evenodd" stroke-width="1pt" fill="#bebebe"/>
++</svg>
+
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 29538a1..fa9752c 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
Summary: LightDM GTK3 Greeter
Name: lightdm-gtk
Version: 1.8.5
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv3+
URL: https://launchpad.net/lightdm-gtk-greeter
@@ -24,6 +24,9 @@ Patch51: lightdm-gtk-greeter-1.8.5-vpath.patch
# backport fix for mouse cursor
# http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter...
Patch100: lightdm-gtk-greeter-1.8.5-lp#1024482.patch
+# add badges for Mate and Window Maker
+# http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter...
+Patch101: lightdm-gtk-greeter-1.9.1-badges.patch
BuildRequires: gettext
BuildRequires: intltool
@@ -72,6 +75,7 @@ A LightDM greeter that uses the GTK2 toolkit.
%setup -q -n lightdm-gtk-greeter-%{version}
%patch100 -p1 -b .lp#1024482
+%patch101 -p0 -b .badges
%patch50 -p1 -b .bg_crash
%patch51 -p1 -b .vpath
@@ -193,6 +197,9 @@ fi
%changelog
+* Sat Jan 31 2015 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.8.5-11
+- add badges for Mate and Window Maker (#1178498)
+
* Fri Nov 07 2014 Rex Dieter <rdieter(a)fedoraproject.org> 1.8.5-10
- revert +Requires: gnome-icon-theme, adwaita reportedly good enough now (#1128697)
8Â years, 10Â months
[clipper/f21] fix to pkgconfig file
by Timothy Fenn
Summary of changes:
122704f... fix to pkgconfig file (*)
(*) This commit already existed in another branch; no separate mail sent
8Â years, 10Â months