diff options
author | B Stack <bgstack15@gmail.com> | 2019-10-30 14:01:26 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2019-10-30 14:01:26 +0000 |
commit | 8617f170c1327872c477de8a46273361de92a1e4 (patch) | |
tree | 28477c7581fb8e60307dcd2ecb1e68566c396b85 | |
parent | Merge branch 'freefilesync-bump' into 'master' (diff) | |
parent | el8: add volumeicon (diff) | |
download | stackrpms-8617f170c1327872c477de8a46273361de92a1e4.tar.gz stackrpms-8617f170c1327872c477de8a46273361de92a1e4.tar.bz2 stackrpms-8617f170c1327872c477de8a46273361de92a1e4.zip |
Merge branch 'centos-8' into 'master'
el8: add xfdesktop
See merge request bgstack15/stackrpms!96
-rw-r--r-- | u2f-hidraw-policy/README.md | 13 | ||||
-rw-r--r-- | u2f-hidraw-policy/u2f-hidraw-policy.spec | 77 | ||||
-rw-r--r-- | volumeicon/README.md | 13 | ||||
-rw-r--r-- | volumeicon/volumeicon-0.5.1.tar.gz | bin | 0 -> 172401 bytes | |||
-rw-r--r-- | volumeicon/volumeicon.desktop | 111 | ||||
-rw-r--r-- | volumeicon/volumeicon.spec | 135 | ||||
-rw-r--r-- | xfdesktop/README.md | 13 | ||||
-rw-r--r-- | xfdesktop/sources | 1 | ||||
-rw-r--r-- | xfdesktop/stackrpms-xfdesktop.spec.diff | 39 | ||||
-rw-r--r-- | xfdesktop/xfdesktop-4.10.3-backdrop-change-fix.patch | 52 | ||||
-rw-r--r-- | xfdesktop/xfdesktop-4.14.1.tar.bz2 | bin | 0 -> 1533788 bytes | |||
-rw-r--r-- | xfdesktop/xfdesktop-4.9.3-backdrop-image.patch | 12 | ||||
-rw-r--r-- | xfdesktop/xfdesktop.spec | 416 |
13 files changed, 882 insertions, 0 deletions
diff --git a/u2f-hidraw-policy/README.md b/u2f-hidraw-policy/README.md new file mode 100644 index 0000000..c786cc6 --- /dev/null +++ b/u2f-hidraw-policy/README.md @@ -0,0 +1,13 @@ +# u2f-hidraw-policy upstream +https://src.fedoraproject.org/rpms/u2f-hidraw-policy.git + +# Reason for being in stackrpms +CentOS 8 does not package u2f-hidraw-policy yet and waterfox depends on any version of it. + +# Reverse dependency matrix +Distro | u2f-hidraw-policy version +---------- | ---------------- +CentOS 8 | 1.0.2 + +# Differences from upstream +None diff --git a/u2f-hidraw-policy/u2f-hidraw-policy.spec b/u2f-hidraw-policy/u2f-hidraw-policy.spec new file mode 100644 index 0000000..8b936ff --- /dev/null +++ b/u2f-hidraw-policy/u2f-hidraw-policy.spec @@ -0,0 +1,77 @@ +%global _hardened_build 1 + +Name: u2f-hidraw-policy +Version: 1.0.2 +Release: 10%{?dist} +Summary: Udev rule to allow desktop access to HIDRAW U2F tokens + +License: LGPLv2+ +URL: https://github.com/amluto/u2f-hidraw-policy/ +Source0: https://github.com/amluto/%{name}/archive/%{version}.tar.gz + +BuildRequires: gcc + +# We need the udev libraries and the _udevrulesdir macro +BuildRequires: systemd systemd-devel + +# systemd owns /usr/lib/udev/rules.d +Requires: systemd + +%description +u2f-hidraw-policy is a udev helper that detects U2F HID tokens as described +by the U2F spec. + + +%prep +%setup -q + +%build +%make_build CFLAGS="%{optflags} %{__global_ldflags}" + +%install +make install DESTDIR="%{buildroot}/usr" + +%files +%{_udevrulesdir}/60-u2f-hidraw.rules +%{_udevrulesdir}/../u2f_hidraw_id + +%license LICENSE +%doc README.md + +%changelog +* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 21 2018 luto@kernel.org - 1.0.2-8 +- Add BR: gcc + +* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Oct 30 2015 Andy Lutomirski <luto@mit.edu> - 1.0.2-1 +- New version, simplifying packaging +- Harden the build + +* Mon Oct 19 2015 Andy Lutomirski <luto@mit.edu> - 1.0.1-1 +- New version, fixing LICENSE + +* Mon Oct 19 2015 Andy Lutomirski <luto@kernel.org> - 1.0-1 +- New package diff --git a/volumeicon/README.md b/volumeicon/README.md new file mode 100644 index 0000000..a96c5a6 --- /dev/null +++ b/volumeicon/README.md @@ -0,0 +1,13 @@ +# volumeicon upstream +https://src.fedoraproject.org/rpms/volumeicon.git + +# Reason for being in stackrpms +Any of the standard CentOS 8 repos do not package volumeicon yet, and it is a pleasant alternative for controlling volume from the notification area. + +# Reverse dependency matrix +Distro | volumeicon version +---------- | ---------------- +CentOS 8 | 0.5.1 + +# Differences from upstream +CentOS 8 uses keybinder3-devel instead of keybinder-devel. diff --git a/volumeicon/volumeicon-0.5.1.tar.gz b/volumeicon/volumeicon-0.5.1.tar.gz Binary files differnew file mode 100644 index 0000000..2619cba --- /dev/null +++ b/volumeicon/volumeicon-0.5.1.tar.gz diff --git a/volumeicon/volumeicon.desktop b/volumeicon/volumeicon.desktop new file mode 100644 index 0000000..4c92fcb --- /dev/null +++ b/volumeicon/volumeicon.desktop @@ -0,0 +1,111 @@ +[Desktop Entry] +Name=Volume Icon +GenericName=Volume Control +GenericName[af]=Volumebeheer +GenericName[ar]=التحكم في شدة الصوت +GenericName[bg]=Сила на звука +GenericName[bn]=ভলিউম কন্ট্রোল +GenericName[ca]=Control de volum +GenericName[cs]=Ovládání hlasitosti +GenericName[da]=Lydstyrkekontrol +GenericName[de]=Lautstärkeregelung +GenericName[el]=Έλεγχος έντασης ήχου +GenericName[en_GB]=Volume Control +GenericName[eo]=Laŭtecregilo +GenericName[es]=Control de volumen +GenericName[et]=Helivaljuse juhtimine +GenericName[eu]=Bolumen-kontrola +GenericName[fa]=تنظیم بلندی صدا +GenericName[fr]=Contrôle de volume +GenericName[gl]=Control de volume +GenericName[gu]=વોલ્યુમ નિયંત્રણ +GenericName[he]=בקרת עצמה +GenericName[hi]=आवाज निर्धारक +GenericName[hu]=Hangerőszabályzó +GenericName[it]=Regolazione volume +GenericName[ja]=音量 コントロール +GenericName[kn]=ಧ್ವನಿ ನಿಯಂತ್ರಣ +GenericName[ko]=볼륨 조정 +GenericName[lt]=Garsumo valdymas +GenericName[lv]=Skaļuma kontrole +GenericName[nb]=Volumkontroll +GenericName[nl]=Volumeregeling +GenericName[nn]=Volumkontroll +GenericName[pa]=ਵਾਲੀਅਮ ਕੰਟਰੋਲ +GenericName[pl]=Kontrola dźwięku +GenericName[pt]=Controlo de Volume +GenericName[pt_BR]=Controle de volume +GenericName[ro]=Control volum +GenericName[ru]=Управление громкостью +GenericName[sk]=Ovládanie hlasitosti +GenericName[sl]=Nadzor glasnosti +GenericName[sr]=Контрола јачине звука +GenericName[sr@latin]=Kontrola jačine zvuka +GenericName[sv]=Volymkontroll +GenericName[ta]=ஒலிவளவு கட்டுப்பாடு +GenericName[th]=ปรับความดังเสียง +GenericName[tr]=Ses Denetimi +GenericName[ug]=ئاۋاز تىزگىنى +GenericName[uk]=Керування гучністю +GenericName[vi]=Điều khiển âm lượng +GenericName[zh_CN]=音量控制 +GenericName[zh_HK]=音量控制 +GenericName[zh_TW]=音量控制 +Comment=Show desktop volume control +Comment[af]=Wys volumebeheer vir die werkskerm +Comment[ar]=اعرض التحكم في شدة الصوت +Comment[bg]=Показване на управлението на звука +Comment[bn]=ডেস্কটপ ভলিউম কন্ট্রোল প্রদর্শন +Comment[ca]=Mostra el control de volum de l'escriptori +Comment[cs]=Zobrazit ovládání hlasitosti pro pracovní prostředí +Comment[da]=Vis lydstyrkekontrol på skrivebordet +Comment[de]=Lautstärkeregler anzeigen +Comment[el]=Εμφάνιση ελέγχου ήχου επιφάνειας εργασίας +Comment[en_GB]=Show desktop volume control +Comment[es]=Mostrar el control de volumen del escritorio +Comment[et]=Töölaua helipuldi näitamine +Comment[eu]=Erakutsi mahaigaineko bolumen-kontrola +Comment[fa]=نمایش تنظیمات بلندی صدای رومیزی +Comment[fr]=Afficher le contrôle de volume sur le bureau +Comment[gl]=Mostrar o control de volume do escritorio +Comment[gu]=ડેસ્કટોપ વોલ્યુમ નિયંત્રણને બતાવો +Comment[he]=הצגת בקרת עצמה בשולחן העבודה +Comment[hi]=डेस्कटॉप आवाज नियंत्रण दिखाएँ +Comment[hu]=Hangerőszabályzó megjelenítése +Comment[it]=Mostra la regolazione del volume +Comment[ja]=デスクトップの音量を調節するアプレットです +Comment[kn]=ಗಣಕತೆರೆ ಧ್ವನಿ ನಿಯಂತ್ರಣವನ್ನು ತೋರಿಸಿ +Comment[ko]=데스크톱 볼륨 조정 표시 +Comment[lt]=Rodyti darbastalio garsumo valdiklį +Comment[lv]=Rādīt darbvirsmas skaņas kontroli +Comment[nb]=Vis volumkontroll for skrivebordet +Comment[nl]=Volumeregeling voor werkomgeving tonen +Comment[nn]=Vis volumkontroll for skrivebord +Comment[pa]=ਡੈਸਕਟਾਪ ਵਾਲੀਅਮ ਕੰਟਰੋਲ ਵੇਖੋ +Comment[pl]=Wyświetlanie kontroli dźwięku na pulpicie +Comment[pt]=Apresentar o controlo de volume na área de trabalho +Comment[pt_BR]=Mostrar controle de volume na área de trabalho +Comment[ro]=Arată controlul volumului pe desktop +Comment[ru]=Открыть управление громкостью звука +Comment[sk]=Zobraziť ovládanie hlasitosti pracovnej plochy +Comment[sl]=Pokaži namizni nadzornik zvoka +Comment[sr]=Прикажи контролу јачине звука радне површи +Comment[sr@latin]=Prikaži kontrolu jačine zvuka radne površi +Comment[sv]=Visa skrivbordets volymkontroll +Comment[ta]=பணிமேடை ஒலிவளவு கட்டுப்பாட்டை காட்டு +Comment[te]=రంగస్థల వాల్యూమ్ నియంత్రికను చూపు +Comment[th]=แสดงเครื่องมือปรับความดังเสียงของเดสก์ท็อป +Comment[tr]=Masaüstü ses denetimini göster +Comment[ug]=ئۈستەلئۈستى ئاۋاز تىزگىننى كۆرسەت +Comment[uk]=Показати керування гучністю +Comment[vi]=Hiện điều khiển âm lượng +Comment[zh_CN]=显示桌面音量控制 +Comment[zh_HK]=顯示桌面音量控制 +Comment[zh_TW]=顯示桌面音量控制 +Exec=volumeicon +TryExec=volumeicon +Icon=multimedia-volume-control +Type=Application +Terminal=false +StartupNotify=false +Categories=GTK;AudioVideo;Audio;Mixer diff --git a/volumeicon/volumeicon.spec b/volumeicon/volumeicon.spec new file mode 100644 index 0000000..f644dd5 --- /dev/null +++ b/volumeicon/volumeicon.spec @@ -0,0 +1,135 @@ +# Review at https://bugzilla.redhat.com/show_bug.cgi?id=722914 + +Name: volumeicon +Version: 0.5.1 +Release: 3%{?dist} +Summary: Lightweight volume control for the system tray + +License: GPLv3 +URL: http://www.softwarebakery.com/maato/volumeicon.html +Source0: http://www.softwarebakery.com/maato/files/volumeicon/volumeicon-%{version}.tar.gz +# Source1 was borrowed from gnome-media package and adjusted for our needs +Source1: %{name}.desktop + +BuildRequires: gcc +BuildRequires: alsa-lib-devel +BuildRequires: desktop-file-utils +BuildRequires: gtk3-devel +BuildRequires: keybinder3-devel +BuildRequires: libnotify-devel >= 0.5.0 +BuildRequires: intltool +BuildRequires: gettext + +Requires: pavucontrol + +%description +Volume Icon aims to be a lightweight volume control that sits in your system +tray. + +Features: +* Change volume by scrolling on the systray icon +* Ability to choose which channel to control +* Configurable stepsize +* Several icon themes +* Configurable external mixer +* Volume slider +* Hotkey support + +%prep +%setup -q + +%build +# Use pavucontrol by default in Fedora +%configure --enable-notify --with-default-mixerapp=pavucontrol +%make_build + +%install +%make_install INSTALL='install -p' +%find_lang %{name} +desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart %{SOURCE1} + +%files -f %{name}.lang +%license COPYING +%doc AUTHORS ChangeLog +%config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop +%{_bindir}/%{name} +%{_datadir}/%{name}/ + +%changelog +* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Apr 02 2018 Raphael Groner <projects.rg@smart.ms> - 0.5.1-1 +- new version +- drop upstreamed patches +- update build dependencies +- add runtime dependency pavucontrol, explicitly +- modernize + +* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 28 2012 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.6-1 +- Update to 0.4.6. Uses 'default' ALSA device now + +* Sat Jan 28 2012 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.5-3 +- Temporarily revert "Use default ALSA device rather than hardcoded 'hw:0'" + for we don't want this in F16 + +* Sat Jan 28 2012 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.5-2 +- Fix build error on rawhide + +* Sat Jan 14 2012 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.5-1 +- Update ot 0.4.5 (#781649) +- Enable libnotify support (#781642) +- Drop upstreamed DSO fix +- Use default ALSA device rather than hardcoded 'hw:0' + +* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 0.4.1-4 +- Rebuild for new libpng + +* Thu Aug 11 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.1-3 +- Fix application name in desktop file + +* Wed Jul 20 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.1-2 +- Fixes as per package review: Fix license tag, add defattr, drop README, fix + typo and add some comments (#722914) + +* Fri Jul 01 2011 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.1-1 +- Inital package diff --git a/xfdesktop/README.md b/xfdesktop/README.md new file mode 100644 index 0000000..915903c --- /dev/null +++ b/xfdesktop/README.md @@ -0,0 +1,13 @@ +# xfdesktop upstream +https://src.fedoraproject.org/rpms/xfdesktop.git + +# Reason for being in stackrpms +CentOS 8 does not package xfdesktop yet, and neither does copr://nikitines/XFCE so any version of xfdesktop will suffice. + +# Reverse dependency matrix +Distro | xfdesktop version +---------- | ---------------- +CentOS 8 | 4.14.1 + +# Differences from upstream +CentOS 8 uses libgudev-devel instead of libgudev1-devel, so changing the one dependency name allowed the rpmbuild to finish successfully. diff --git a/xfdesktop/sources b/xfdesktop/sources new file mode 100644 index 0000000..92fe03b --- /dev/null +++ b/xfdesktop/sources @@ -0,0 +1 @@ +SHA512 (xfdesktop-4.14.1.tar.bz2) = 05e8e79efe9683d46e69375eb5c3f1d923b5e875bc7dbb8f9405338e44ae0c48172af119c5e7b141595c38b8de00c58c21f7b7d218737f5ddc2428fd7aa4bc6c diff --git a/xfdesktop/stackrpms-xfdesktop.spec.diff b/xfdesktop/stackrpms-xfdesktop.spec.diff new file mode 100644 index 0000000..1ed41d5 --- /dev/null +++ b/xfdesktop/stackrpms-xfdesktop.spec.diff @@ -0,0 +1,39 @@ +--- /usr/src/xfdesktop/xfdesktop/xfdesktop.spec 2019-10-23 21:09:09.217777052 -0400 ++++ /home/bgstack15/dev/stackrpms/xfdesktop/xfdesktop.spec 2019-10-23 22:29:48.345624495 -0400 +@@ -2,7 +2,7 @@ + + Name: xfdesktop + Version: 4.14.1 +-Release: 2%{?dist} ++Release: 1%{?dist} + Summary: Desktop manager for the Xfce Desktop Environment + + License: GPLv2+ +@@ -14,7 +14,7 @@ + BuildRequires: libxfce4ui-devel >= %{xfceversion} + BuildRequires: gettext + BuildRequires: exo-devel >= 0.12.0 +-BuildRequires: libgudev1-devel >= 145 ++BuildRequires: libgudev-devel >= 145 + BuildRequires: Thunar-devel >= 1.8.0 + BuildRequires: dbus-glib-devel >= 0.84 + BuildRequires: garcon-devel >= 0.1.2 +@@ -28,7 +28,7 @@ + Requires: xfwm4 >= %{xfceversion} + Requires: xfce4-panel >= %{xfceversion} + Requires: redhat-menus +-Requires: desktop-backgrounds-compat ++#Requires: desktop-backgrounds-compat + + + %description +@@ -69,6 +69,9 @@ + + + %changelog ++* Wed Oct 23 2019 B Stack <bgstack15@gmail.com> - 4.14.1-1 ++- Build for el8 ++ + * Thu Sep 12 2019 Kevin Fenzi <kevin@scrye.com> - 4.14.1-2 + - Fix the default background. Upstream changed default, we need to adjust our change. + diff --git a/xfdesktop/xfdesktop-4.10.3-backdrop-change-fix.patch b/xfdesktop/xfdesktop-4.10.3-backdrop-change-fix.patch new file mode 100644 index 0000000..068bde7 --- /dev/null +++ b/xfdesktop/xfdesktop-4.10.3-backdrop-change-fix.patch @@ -0,0 +1,52 @@ +diff -ur xfdesktop-4.10.3.org/common/xfdesktop-common.c xfdesktop-4.10.3/common/xfdesktop-common.c +--- xfdesktop-4.10.3.org/common/xfdesktop-common.c 2014-11-16 07:20:57.000000000 +0100 ++++ xfdesktop-4.10.3/common/xfdesktop-common.c 2014-12-11 08:58:23.511865532 +0100 +@@ -102,26 +102,38 @@ + items = 0; + files = g_strsplit(contents, "\n", -1); + ++ g_free(contents); /* not needed anymore */ ++ + /* Since the first line is the file identifier, we need to skip it. + * Additionally, we want to skip blank lines. */ +- for(i = 1; files[i] != NULL; i++) { +- if(g_strcmp0(files[i], "") != 0) { +- g_free(files[items]); +- files[items] = g_strdup(files[i]); +- DBG("files[items] %s", files[items]); +- items++; ++ ++ /* a file with just the header will have only one line */ ++ ++ if(files[0] != NULL) ++ { ++ g_free(files[0]); /* that's the only non-empty line we need to remove */ ++ files[0] = NULL; ++ for(i = 1; files[i] != NULL; i++) { ++ if(g_strcmp0(files[i], "") != 0) { ++ files[items]=files[i]; /* move the string to the current item slot */ ++ ++ items++; ++ } else { ++ g_free(files[i]); /* free the irrelevant empty string */ ++ } + } ++ files[items] = NULL; /* set the sentinel */ ++ ++ /* resize */ ++ ++ files = g_realloc(files, sizeof(gchar *) * (items+1)); + } +- files[items+1] = NULL; + +- files = g_realloc(files, sizeof(gchar *) * (items+1)); + + DBG("items %d", items); + if(n_items) + *n_items = items; + +- g_free(contents); +- + return files; + } + diff --git a/xfdesktop/xfdesktop-4.14.1.tar.bz2 b/xfdesktop/xfdesktop-4.14.1.tar.bz2 Binary files differnew file mode 100644 index 0000000..61a957d --- /dev/null +++ b/xfdesktop/xfdesktop-4.14.1.tar.bz2 diff --git a/xfdesktop/xfdesktop-4.9.3-backdrop-image.patch b/xfdesktop/xfdesktop-4.9.3-backdrop-image.patch new file mode 100644 index 0000000..e7456dd --- /dev/null +++ b/xfdesktop/xfdesktop-4.9.3-backdrop-image.patch @@ -0,0 +1,12 @@ +diff -Nur xfdesktop-4.9.3.orig/common/xfdesktop-common.h xfdesktop-4.9.3/common/xfdesktop-common.h +--- xfdesktop-4.9.3.orig/common/xfdesktop-common.h 2012-04-14 02:00:51.000000000 -0600 ++++ xfdesktop-4.9.3/common/xfdesktop-common.h 2012-04-14 14:12:58.292166992 -0600 +@@ -32,7 +32,7 @@ + #include <X11/Xlib.h> + + #define XFDESKTOP_CHANNEL "xfce4-desktop" +-#define DEFAULT_BACKDROP DATADIR "/backgrounds/xfce/xfce-blue.jpg" ++#define DEFAULT_BACKDROP DATADIR "/backgrounds/images/default.png" + #define DEFAULT_BACKDROP_LIST "xfce4/desktop/backdrop.list" + #define DEFAULT_ICON_FONT_SIZE 12 + #define DEFAULT_ICON_SIZE 32 diff --git a/xfdesktop/xfdesktop.spec b/xfdesktop/xfdesktop.spec new file mode 100644 index 0000000..4bc3107 --- /dev/null +++ b/xfdesktop/xfdesktop.spec @@ -0,0 +1,416 @@ +%global xfceversion 4.14 + +Name: xfdesktop +Version: 4.14.1 +Release: 1%{?dist} +Summary: Desktop manager for the Xfce Desktop Environment + +License: GPLv2+ +URL: http://www.xfce.org/ +#VCS: git:git://git.xfce.org/xfce/xfdesktop +Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 + +BuildRequires: gcc-c++ +BuildRequires: libxfce4ui-devel >= %{xfceversion} +BuildRequires: gettext +BuildRequires: exo-devel >= 0.12.0 +BuildRequires: libgudev-devel >= 145 +BuildRequires: Thunar-devel >= 1.8.0 +BuildRequires: dbus-glib-devel >= 0.84 +BuildRequires: garcon-devel >= 0.1.2 +BuildRequires: libwnck3-devel >= 3.14 +BuildRequires: libnotify-devel >= 0.4.0 +BuildRequires: xfconf-devel >= %{xfceversion} +BuildRequires: intltool +BuildRequires: desktop-file-utils +BuildRequires: libSM-devel +BuildRequires: libICE-devel +Requires: xfwm4 >= %{xfceversion} +Requires: xfce4-panel >= %{xfceversion} +Requires: redhat-menus +#Requires: desktop-backgrounds-compat + + +%description +This package includes a desktop manager for the Xfce Desktop Environment. + + +%prep +%setup -q + +# change default background for Fedora +sed -i 's|/backgrounds/xfce/xfce-stripes.png|/backgrounds/images/default.png|' common/xfdesktop-common.h + +%build +%configure + +%make_build + +%install + +%make_install + +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +desktop-file-validate \ + $RPM_BUILD_ROOT/%{_datadir}/applications/xfce-backdrop-settings.desktop + +%find_lang %{name} + +%files -f %{name}.lang +%license COPYING +%doc README TODO ChangeLog NEWS AUTHORS +%{_bindir}/* +%{_datadir}/applications/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/pixmaps/* +%{_datadir}/backgrounds/xfce +%{_mandir}/man1/* + + +%changelog +* Wed Oct 23 2019 B Stack <bgstack15@gmail.com> - 4.14.1-1 +- Build for el8 + +* Thu Sep 12 2019 Kevin Fenzi <kevin@scrye.com> - 4.14.1-2 +- Fix the default background. Upstream changed default, we need to adjust our change. + +* Mon Aug 12 2019 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.14.1-1 +- Update to 4.14.1 + +* Mon Jul 29 2019 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.13.6-1 +- Update to 4.13.6 + +* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jul 02 2019 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.13.5-1 +- Update to 4.13.5 + +* Sat May 18 2019 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.13.4-1 +- Update to 4.13.4 + +* Sat Mar 09 2019 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.13.3-1 +- Update to 4.13.3 + +* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Aug 11 2018 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.13.2-1 +- Update to 4.13.2 +- Drop upstreamed patch +- Drop ancient conditionals + +* Thu Jul 19 2018 Kevin Fenzi <kevin@scrye.com> - 4.12.4-6 +- Rebuild for new Thunar. + +* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jul 07 2017 Kevin Fenzi <kevin@scrye.com> - 4.12.4-1 +- Update to 4.12.4. Fixes bug #1468769 + +* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Aug 21 2015 Kevin Fenzi <kevin@scrye.com> 4.12.3-2 +- Add upstream patch to not redraw desktop on every mouse click. +- Fixes bug #1252078 + +* Mon Jul 20 2015 Kevin Fenzi <kevin@scrye.com> 4.12.3-1 +- Update to 4.12.3 + +* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.12.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun May 17 2015 Kevin Fenzi <kevin@scrye.com> 4.12.2-1 +- Update to 4.12.2 + +* Sun Mar 22 2015 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.12.1-1 +- Update to 4.12.1 + +* Sat Feb 28 2015 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.12.0-1 +- Update latest stable release 4.12.0 +- spec cleanup +- changed default background patch to sed +- removed change backdrop patch (testing) + +* Sat Feb 21 2015 Till Maas <opensource@till.name> - 4.10.3-4 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Thu Jan 08 2015 Kevin Fenzi <kevin@scrye.com> 4.10.3-3 +- Add patch with fix for crash in timed desktop backdrop changes. Fixes bug #1174160 + +* Thu Nov 27 2014 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.10.3-2 +- bump release + +* Sun Nov 16 2014 Kevin Fenzi <kevin@scrye.com> 4.10.3-1 +- Update to 4.10.3 with various fixes. + +* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.10.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.10.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.10.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Mar 10 2013 Kevin Fenzi <kevin@scrye.com> 4.10.2-1 +- Update to 4.10.2. Drop upstreamed patch + +* Wed Mar 06 2013 Kevin Fenzi <kevin@scrye.com> 4.10.1-2 +- Fix background bug. Fixes bug #918646 (Xfce bug #9892) + +* Sat Mar 02 2013 Kevin Fenzi <kevin@scrye.com> 4.10.1-1 +- Update to 4.10.1 + +* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.10.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Oct 06 2012 Christoph Wickert <cwickert@fedoraproject.org> - 4.10.0-4 +- Search new background location in list (bugzilla.xfce.org #8799) + +* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat May 19 2012 Kevin Fenzi <kevin@scrye.com> - 4.10.0-2 +- Drop requirement for xfce4-doc which no longer exists. + +* Sun Apr 29 2012 Christoph Wickert <cwickert@fedoraproject.org> - 4.10.0-1 +- Update to 4.10.0 final +- Remove obsolete BuildRequirements +- Make build verbose +- Add VCS key + +* Sat Apr 14 2012 Kevin Fenzi <kevin@scrye.com> - 4.9.3-1 +- Update to 4.9.3 (Xfce 4.10pre2) + +* Tue Apr 03 2012 Kevin Fenzi <kevin@scrye.com> - 4.9.2-1 +- Update to 4.9.2 + +* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Sep 13 2011 Christoph Wickert <cwickert@fedoraproject.org> - 4.8.3-1 +- Update to 4.8.3 + +* Thu May 19 2011 Orion Poplawski <orion@cora.nwra.com> - 4.8.2-2 +- Drop BR on libxfce4menu-devel + +* Fri Apr 22 2011 Kevin Fenzi <kevin@scrye.com> - 4.8.2-1 +- Update to 4.8.2 + +* Tue Feb 08 2011 Kevin Fenzi <kevin@tummy.com> - 4.8.1-3 +- Fix requires and rebuild. + +* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jan 30 2011 Kevin Fenzi <kevin@tummy.com> - 4.8.1-1 +- Update to 4.8.1 + +* Sun Jan 16 2011 Kevin Fenzi <kevin@tummy.com> - 4.8.0-1 +- Update to 4.8.0 + +* Sun Jan 02 2011 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.5-1 +- Update to 4.7.5 + +* Sun Dec 05 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.4-1 +- Update to 4.7.4 +- Drop libnotify fix (upstreamed) + +* Sat Dec 04 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.3-1 +- Update to 4.7.3 +- Fix for libnotify 0.7.0 (bugzilla.xfce.org #6915) + +* Sat Nov 13 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.2-1 +- Update to 4.7.2 + +* Wed Sep 29 2010 Jesse Keating <jkeating@fedpraproject.org> - 4.6.2-3 +- Rebuilt for gcc bug 634757 + +* Sun Sep 19 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.2-2 +- Fix backdrop-image.patch for F14 artwork (#635399) + +* Fri May 21 2010 Kevin Fenzi <kevin@tummy.com> - 4.6.2-1 +- Update to 4.6.2 + +* Sat Apr 17 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.1-6 +- Adjustments for recent Goddard artwork changes + +* Sun Feb 14 2010 Kevin Fenzi <kevin@tummy.com> - 4.6.1-5 +- Add patch for DSO linking. Fixes bug #564826 + +* Sun Dec 20 2009 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.1-4 +- Menu fixes + +* Sun Nov 01 2009 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.1-3 +- Fix dependency for default background image + +* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sun Apr 19 2009 Kevin Fenzi <kevin@tummy.com> - 4.6.1-1 +- Update to 4.6.1 + +* Mon Apr 13 2009 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.0-4 +- Exclude gnome-default-applications from menu to avoid duplicates (#488558) + +* Mon Mar 02 2009 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.0-3 +- Fix directory ownership problems +- Require xfce4-doc and redhat-menus +- Tweak and clean up Xfce menu + +* Fri Feb 27 2009 Kevin Fenzi <kevin@tummy.com> - 4.6.0-2 +- Add libSM-devel to BuildRequires + +* Thu Feb 26 2009 Kevin Fenzi <kevin@tummy.com> - 4.6.0-1 +- Update to 4.6.0 +- Remove unneeded BuildRequires + +* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.5.99.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jan 26 2009 Kevin Fenzi <kevin@tummy.com> - 4.5.99.1-1 +- Update to 4.5.99.1 + +* Tue Jan 13 2009 Kevin Fenzi <kevin@tummy.com> - 4.5.93-1 +- Update to 4.5.93 + +* Sun Dec 28 2008 Kevin Fenzi <kevin@tummy.com> - 4.5.92-1 +- Update 4.5.92 + +* Sun Aug 31 2008 Christoph Wickert <fedora@christoph-wickert.de> - 4.4.2-6 +- Update xdg-userdir-compat.patch to use upstream's variable names + +* Wed Aug 27 2008 Christoph Wickert <fedora@christoph-wickert.de> - 4.4.2-5 +- Use Fedora icon for desktop menu plugin (#445986) +- Respect xdg user directory paths (#457740) +- Fix menu icons +- Fix CRITICAL register message on startup +- Fix for x86_64 +- Simplify g_list_free code + +* Mon Aug 11 2008 Kevin Fenzi <kevin@tummy.com> - 4.4.2-4 +- Add partial memory leak patch (partially fixes #428662) + +* Tue Feb 19 2008 Kevin Fenzi <kevin@tummy.com> - 4.4.2-3 +- Rebuild for gcc43 +- Add patch for gcc43 + +* Mon Dec 17 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.2-2 +- Apply patch to show default backdrop + +* Sun Nov 18 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.2-1 +- Update to 4.4.2 + +* Mon Aug 27 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.1-3 +- Update License tag +- Update patch to have correct desktop image filename + +* Mon Jul 9 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.1-2 +- Add patch to fix menu lockups with new gtk2 + +* Wed Apr 11 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.1-1 +- Update to 4.4.1 + +* Tue Apr 3 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.0-2 +- Own %%{_libdir}/xfce4/modules/ +- Own %%{_datadir}/xfce4-menueditor/ + +* Sun Jan 21 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.0-1 +- Update to 4.4.0 + +* Fri Nov 10 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.2-1 +- Update to 4.3.99.2 + +* Thu Oct 5 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.1-5 +- Fix defattr +- Add period to the end of description +- Add gtk-update-icon-cache + +* Wed Oct 4 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.1-4 +- Bump release for devel checkin + +* Sun Sep 17 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.1-3 +- Don't own datadir/xfce4/panel-plugins as thats owned by xfce4-panel + +* Sat Sep 9 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.1-2 +- Add exo, dbus-glib and Thunar-devel BuildRequires + +* Sun Sep 3 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.1-1 +- Update to 4.3.99.1 + +* Wed Jul 12 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.90.2 +- Update to 4.3.90.2 + +* Mon May 8 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.90.1 +- Update to 4.3.90.1 + +* Mon Nov 7 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.3-1.fc5 +- Update to 4.2.3 +- Added dist tag + +* Tue May 17 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.2-1.fc4 +- Update to 4.2.2 + +* Fri Mar 25 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.1-3.fc4 +- lowercase Release + +* Wed Mar 23 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.1-2.FC4 +- Removed unneeded a/la files +- Rediffed xfdesktop-image patch against current version and applied + +* Tue Mar 15 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.1-1 +- Updated to 4.2.1 version + +* Thu Jan 27 2005 Than Ngo <than@redhat.com> 4.2.0-1 +- 4.2.0 + +* Wed Sep 01 2004 Than Ngo <than@redhat.com> 4.0.6-2 +- get rid useless static library #131485 + +* Tue Jul 20 2004 Than Ngo <than@redhat.com> 4.0.6-1 +- update to 4.0.6 +- fix bug #122743, #124951, #125058 + +* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com> +- rebuilt + +* Tue Apr 20 2004 Than Ngo <than@redhat.com> 4.0.5-2 +- Change defaults for fedora, thanks to Olivier Fourdan <fourdan@xfce.org> + +* Thu Apr 15 2004 Than Ngo <than@redhat.com> 4.0.5-1 +- update to 4.0.5 + +* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com> +- rebuilt + +* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> +- rebuilt + +* Tue Jan 27 2004 Than Ngo <than@redhat.com> 4.0.3-2 +- fixed dependant libraries check on x86_64 + +* Wed Jan 14 2004 Than Ngo <than@redhat.com> 4.0.3-1 +- 4.0.3 release + +* Thu Dec 25 2003 Than Ngo <than@redhat.com> 4.0.2-1 +- 4.0.2 release + +* Tue Dec 16 2003 Than Ngo <than@redhat.com> 4.0.1-1 +- initial build |