File xsmc-calc-1.0.0-3.diff of Package xsmc-calc
diff -Naur xsmc-calc-1.0.0_orig/draw.c xsmc-calc-1.0.0/draw.c
--- xsmc-calc-1.0.0_orig/draw.c 2001-10-31 19:27:05.000000000 +0100
+++ xsmc-calc-1.0.0/draw.c 2007-06-24 19:09:08.845731639 +0200
@@ -676,7 +676,6 @@
break;
- default:
}
}
diff -Naur xsmc-calc-1.0.0_orig/Makefile xsmc-calc-1.0.0/Makefile
--- xsmc-calc-1.0.0_orig/Makefile 2001-10-30 22:23:38.000000000 +0100
+++ xsmc-calc-1.0.0/Makefile 2007-06-24 19:50:39.347657256 +0200
@@ -2,9 +2,7 @@
xsmc: smc.o calc.o draw.o dialog.o
- gcc -lm -oxsmc -Wall -lX11 -lm -L/usr/X11R6/lib\
- smc.o calc.o draw.o dialog.o
-
+ gcc -oxsmc -Wall smc.o calc.o draw.o dialog.o -L/usr/X11R6/$(LIBID) -lX11 -lm
{ gzip *.1*; true; }
#
@@ -35,9 +33,11 @@
cd ..; tar czvf xsmc-calc.1.0.0.tgz xsmc-calc/
install:
- install -m 755 ./xsmc /usr/bin/
- install -m 644 ./xsmc.1.gz /usr/man/man1
+ install -d 744 $(DESTDIR)/usr/bin
+ install -m 755 ./xsmc $(DESTDIR)/usr/bin/
+ install -d 744 $(DESTDIR)/usr/share/man/man1
+ install -m 644 ./xsmc.1.gz $(DESTDIR)/usr/share/man/man1
uninstall:
rm -f /usr/bin/xsmc
- rm -f ($MANDIR)/man1/xsmc.1.*
\ Kein Zeilenumbruch am Dateiende.
+ rm -f $(MANDIR)/man1/xsmc.1.*
diff -Naur xsmc-calc-1.0.0_orig/smc.c xsmc-calc-1.0.0/smc.c
--- xsmc-calc-1.0.0_orig/smc.c 2001-10-31 19:26:55.000000000 +0100
+++ xsmc-calc-1.0.0/smc.c 2007-06-24 20:16:15.418502866 +0200
@@ -141,10 +141,10 @@
gc=XCreateGC(display, window, 0, 0);
- fontdialogname=XLoadQueryFont(display, "*-helvetica-medium-r-normal--12*");
- if(!fontdialogname) fprintf(stderr, "Unable to load font\n");
- fontchartname=XLoadQueryFont(display, "*helvetica*6*");
- if(!fontchartname) fprintf(stderr, "Unable to load font\n");
+ fontdialogname=XLoadQueryFont(display, "*-*-*-*-*--14*");
+ if(!fontdialogname) fprintf(stderr, "Unable to load font1\n");
+ fontchartname=XLoadQueryFont(display, "*10*");
+ if(!fontchartname) fprintf(stderr, "Unable to load font2\n");
XSelectInput(display, window,
ExposureMask|KeyPressMask|KeyReleaseMask|PointerMotionMask);
@@ -400,7 +400,6 @@
case XK_p:
printf("Printing not yet implemented\n"); break;
- default:
}
break;
@@ -413,7 +412,6 @@
case XK_Shift_R:
Keyshift=0; break;
- default:
}
break;
@@ -439,8 +437,6 @@
}
break;
- default:
-
}
}