Compare commits
No commits in common. "rawhide" and "f27" have entirely different histories.
6 changed files with 183 additions and 1 deletions
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
/wmclock-1.0.12.2-pruned.tar.gz
|
||||
/wmclock-1.0.14.tar.gz
|
||||
/wmclock-1.0.16.tar.gz
|
||||
|
|
@ -1 +0,0 @@
|
|||
Orphaned for 6+ weeks
|
||||
1
sources
Normal file
1
sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
e9b02a74f8dc96415262c7199b1ccaa7 wmclock-1.0.16.tar.gz
|
||||
75
wmclock-1.0.12.2-nopolling.patch
Normal file
75
wmclock-1.0.12.2-nopolling.patch
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
diff -up wmclock-1.0.12.2/wmclock.c.nopolling wmclock-1.0.12.2/wmclock.c
|
||||
--- wmclock-1.0.12.2/wmclock.c.nopolling 2000-03-08 10:31:33.000000000 +0300
|
||||
+++ wmclock-1.0.12.2/wmclock.c 2012-05-31 18:12:52.214041416 +0400
|
||||
@@ -20,6 +20,7 @@
|
||||
* with the software or the use or other dealings in the software.
|
||||
*/
|
||||
|
||||
+#include <sys/select.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/time.h>
|
||||
@@ -141,7 +142,8 @@ int yPos[NUM_Y_POSITIONS];
|
||||
Display *dpy;
|
||||
Window rootWindow;
|
||||
int screen;
|
||||
-/* int xFd; */
|
||||
+int xFd;
|
||||
+fd_set xFdSet;
|
||||
int displayDepth;
|
||||
XSizeHints sizeHints;
|
||||
XWMHints wmHints;
|
||||
@@ -801,6 +803,7 @@ int main(int argc, char **argv)
|
||||
XTextProperty wmName;
|
||||
XClassHint classHint;
|
||||
Pixmap shapeMask;
|
||||
+ struct timeval nextEvent;
|
||||
|
||||
/* Parse command line options */
|
||||
progName = extractProgName(argv[0]);
|
||||
@@ -842,7 +845,7 @@ int main(int argc, char **argv)
|
||||
screen = DefaultScreen(dpy);
|
||||
rootWindow = RootWindow(dpy, screen);
|
||||
displayDepth = DefaultDepth(dpy, screen);
|
||||
- /* xFd = XConnectionNumber(dpy); */
|
||||
+ xFd = XConnectionNumber(dpy);
|
||||
|
||||
/* Icon Daten nach XImage konvertieren */
|
||||
GetXpms();
|
||||
@@ -1042,14 +1045,29 @@ int main(int argc, char **argv)
|
||||
poll((struct poll *) 0, (size_t) 0, 50); /* 5/100 sec */
|
||||
}
|
||||
#else
|
||||
- if (enableYearDisplay)
|
||||
- {
|
||||
- usleep(200000L); /* 1/5 sec */
|
||||
- }
|
||||
+ //We compute the date of next event, in order to avoid polling
|
||||
+ if (enableBlinking)
|
||||
+ {
|
||||
+ gettimeofday(&nextEvent,NULL);
|
||||
+ nextEvent.tv_sec = 0;
|
||||
+ nextEvent.tv_usec = 1000000-nextEvent.tv_usec;
|
||||
+ }
|
||||
else
|
||||
- {
|
||||
- usleep(50000L); /* 5/100 sec */
|
||||
- }
|
||||
+ {
|
||||
+ if (enableYearDisplay)
|
||||
+ {
|
||||
+ nextEvent.tv_sec = 86400-actualTime%86400;
|
||||
+ nextEvent.tv_usec = 0;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ nextEvent.tv_sec = 60-actualTime%60;
|
||||
+ nextEvent.tv_usec = 0;
|
||||
+ }
|
||||
+ }
|
||||
+ FD_ZERO(&xFdSet);
|
||||
+ FD_SET(xFd,&xFdSet);
|
||||
+ select(FD_SETSIZE,&xFdSet,NULL,NULL,&nextEvent);
|
||||
#endif
|
||||
}
|
||||
return(0);
|
||||
19
wmclock-1.0.14-debian-12-year-display.patch
Normal file
19
wmclock-1.0.14-debian-12-year-display.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
diff -up wmclock-1.0.14/wmclock.c.debian-12-year-display wmclock-1.0.14/wmclock.c
|
||||
--- wmclock-1.0.14/wmclock.c.debian-12-year-display 2010-12-22 15:12:28.000000000 +0300
|
||||
+++ wmclock-1.0.14/wmclock.c 2012-06-04 15:03:14.165555603 +0400
|
||||
@@ -849,7 +849,14 @@ int main(int argc, char **argv)
|
||||
#endif /* !ONLY_SHAPED_WINDOW */
|
||||
for (i = 0; i < NUM_TIME_POSITIONS; i++)
|
||||
{
|
||||
- xPos[i] += enable12HourClock ? timePos24[i] : timePos12[i];
|
||||
+ if (enable12HourClock && (!enableYearDisplay))
|
||||
+ {
|
||||
+ xPos[i] += timePos24[i];
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ xPos[i] += timePos12[i];
|
||||
+ }
|
||||
}
|
||||
|
||||
/* Open the display */
|
||||
85
wmclock.spec
Normal file
85
wmclock.spec
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
Name: wmclock
|
||||
Version: 1.0.16
|
||||
Release: 4%{?dist}
|
||||
|
||||
Summary: Dockable clock applet for WindowMaker
|
||||
License: GPLv2+
|
||||
Group: User Interface/X
|
||||
|
||||
Url: http://www.dockapps.net/wmclock
|
||||
Source: http://www.dockapps.net/download/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: autoconf automake libX11-devel libXext-devel libXpm-devel xorg-x11-proto-devel
|
||||
|
||||
%description
|
||||
Wmclock is an applet which displays the date and time in a dockable
|
||||
tile in the same style as the clock from the N*XTSTEP operating
|
||||
system. Wmclock is specially designed for the WindowMaker window
|
||||
manager, by Alfredo Kojima, and features multiple language support,
|
||||
twenty-four-hour and twelve-hour (am/pm) time display, and, optionally,
|
||||
can run a user-specified program on a mouse click. Wmclock is derived
|
||||
from asclock, a similar clock for the AfterStep window manager.
|
||||
|
||||
%prep
|
||||
%setup -q -c
|
||||
|
||||
%build
|
||||
cd dockapps-*
|
||||
autoreconf -fisv
|
||||
%configure --with-lang=english
|
||||
%make_build
|
||||
|
||||
%install
|
||||
cd dockapps-*
|
||||
%make_install PREFIX=%{_prefix}
|
||||
cp -a README COPYING ..
|
||||
|
||||
%files
|
||||
%doc README COPYING
|
||||
%{_bindir}/%{name}
|
||||
%{_mandir}/man1/%{name}.1*
|
||||
%{_datadir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.16-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.16-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.16-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Dec 02 2016 Alexey I. Froloff <raorn@raorn.name> - 1.0.16-1
|
||||
- New version (rhbz#1397941)
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.14-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.14-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.14-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.14-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.14-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.14-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Mon Jun 04 2012 Alexey I. Froloff <raorn@raorn.name> - 1.0.14-1
|
||||
- New version (rhbz#828150)
|
||||
- Applied year display patch from Debian (rhbz#828150)
|
||||
|
||||
* Mon Jun 04 2012 Alexey I. Froloff <raorn@raorn.name> - 1.0.12.2-2
|
||||
- Added original tarball URL (rhbz#827136)
|
||||
|
||||
* Thu May 31 2012 Alexey I. Froloff <raorn@raorn.name> - 1.0.12.2-1
|
||||
- Initial build for Fedora
|
||||
Loading…
Add table
Add a link
Reference in a new issue