DELTA 517000 38459 28 SVNii pxq3ENDREP DELTA SVNegee--- cmd/wmii9menu.c.orig 2020-10-18 16:18:05 UTC +++ cmd/wmii9menu.c @@ -35,6 +35,7 @@ * Heavily modified by Kris Maglione for use with wmii. */ +#define EXTERN #define IXP_NO_P9_ #define IXP_P9_STRUCTS #include ENDREP DELTA SVN>#>>x^}Rj0}bSnbФ l[M !EQ M;%qz3G3s}`[ϩ\)-SA1?:;_G7IfR䖰Ֆ}k,Ž$~ҜgBh9[p,6Tu$B/FqR.YɨrTZJ0ʍ%rwP|*v0?vw3K]FG}g$qu8 44/Qx(}Lq\!Î6JVޞ˪} .(s^<)qYIEfټb-O% Iú q<=ͼV*#Z<%2͕XK>f@a>bb/0 "M2] ENDREP DELTA SVNFHFF--- cmd/wmii/event.c.orig 2020-10-18 09:39:16 UTC +++ cmd/wmii/event.c @@ -5,6 +5,8 @@ #include #include "fns.h" +long ignoreenter; + typedef void (*EvHandler)(XEvent*); void ENDREP DELTA SVN   --- cmd/wmiir.c.orig 2020-10-18 16:14:32 UTC +++ cmd/wmiir.c @@ -1,6 +1,7 @@ /* Copyight ©2007-2010 Kris Maglione * See LICENSE file for license details. */ +#define EXTERN #define IXP_NO_P9_ #define IXP_P9_STRUCTS #include ENDREP DELTA SVNPRPP--- include/ixp_local.h.orig 2020-10-18 08:53:49 UTC +++ include/ixp_local.h @@ -3,7 +3,11 @@ #include #include -char *argv0; +#ifndef EXTERN +# define EXTERN extern +#endif + +EXTERN char *argv0; #define ARGBEGIN \ int _argtmp=0, _inargv=0; char *_argv=nil; \ if(!argv0) {argv0=*argv; argv++, argc--;} \ ENDREP DELTA SVNCECC--- include/util.h.orig 2010-06-10 07:24:03 UTC +++ include/util.h @@ -4,6 +4,10 @@ #define nil ((void*)0) #define nelem(ary) (sizeof(ary) / sizeof(*ary)) +#ifndef EXTERN +# define EXTERN extern +#endif + /* Types */ #undef uchar #undef ushort @@ -55,7 +59,7 @@ char* vsxprint(const char*, va_list); #define die(...) \ _die(__FILE__, __LINE__, __VA_ARGS__) -char *argv0; +EXTERN char *argv0; #undef ARGBEGIN #undef ARGEND #undef ARGF ENDREP DELTA SVN+-++--- include/x11.h.orig 2020-10-18 08:56:29 UTC +++ include/x11.h @@ -17,6 +17,10 @@ #undef Font #undef Screen +#ifndef EXTERN +# define EXTERN extern +#endif + enum Align { North = 0x01, East = 0x02, @@ -182,8 +186,8 @@ struct Screen { # pragma varargck type "W" Window* #endif -Display *display; -Screen scr; +EXTERN Display *display; +EXTERN Screen scr; extern const Point ZP; extern const Rectangle ZR; ENDREP id: 4-241037.0.r553913/2584 type: file pred: 4-241037.0.r517000/416117 count: 22 text: 553913 0 22 1257 596dfdf9669ab41eca353aceca64aa56 fc4774bae7534e8f2734b1ceba190404ad3c9da5 553912-bveh/_4 props: 300914 71 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/x11-wm/wmii-devel/Makefile copyroot: 0 / id: 5-553913.0.r553913/2888 type: file count: 0 text: 553913 51 246 229 a5c6254f1fa68ccd2cf7a75f50500b34 4ce941213a6f305d0fd079b93d345ab583e8fe7f 553912-bveh/_7 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/x11-wm/wmii-devel/files/patch-cmd_wmii9menu.c copyroot: 0 / id: 8-553913.0.r553913/3180 type: file count: 0 text: 553913 310 434 830 3ba1497454097db403ef705e0612769f 38abbeb30641e703dbb2ea4e9326756113ab2467 553912-bveh/_9 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/x11-wm/wmii-devel/files/patch-cmd_wmii_dat.h copyroot: 0 / id: a-553913.0.r553913/3472 type: file count: 0 text: 553913 757 215 198 d4c58e7c5efdca68feba614d7b07c668 605b56e685c42cac93febec630be82082fe6869e 553912-bveh/_b props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/x11-wm/wmii-devel/files/patch-cmd_wmii_event.c copyroot: 0 / id: c-553913.0.r553913/3766 type: file count: 0 text: 553913 985 282 265 2654c5ea866861befb14fd3a4853f691 fd5ef1c132ef87279ee96bfee035a24c0ed5dc03 553912-bveh/_d props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/x11-wm/wmii-devel/files/patch-cmd_wmiir.c copyroot: 0 / id: e-553913.0.r553913/4055 type: file count: 0 text: 553913 1280 353 336 7731d17265b0bda3747f2a9fb12e4f6a a753bc9cdd6965bdd30711cb3eb91c5002f64630 553912-bveh/_f props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/x11-wm/wmii-devel/files/patch-include_ixp__local.h copyroot: 0 / id: g-553913.0.r553913/4354 type: file count: 0 text: 553913 1646 468 451 029c2e21c6d5ce7439a9a9958aaaa60e d476c097f2ae778b903081673a71ba144a7ed2db 553912-bveh/_h props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/x11-wm/wmii-devel/files/patch-include_util.h copyroot: 0 / id: i-553913.0.r553913/4647 type: file count: 0 text: 553913 2127 444 427 fd5e9637095135aca9160f8203425e43 7887a91ba23bd8b1e9e93aa1b40fd21f49958dd8 553912-bveh/_j props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/x11-wm/wmii-devel/files/patch-include_x11.h copyroot: 0 / PLAIN K 19 patch-cmd__Makefile V 27 file 6-336942.0.r428551/768 K 25 patch-cmd__menu__Makefile V 28 file 9-336942.0.r428551/1087 K 25 patch-cmd__wmii__Makefile V 28 file b-336942.0.r428551/1414 K 21 patch-cmd_wmii9menu.c V 28 file 5-553913.0.r553913/2888 K 20 patch-cmd_wmii_dat.h V 28 file 8-553913.0.r553913/3180 K 22 patch-cmd_wmii_event.c V 28 file a-553913.0.r553913/3472 K 17 patch-cmd_wmiir.c V 28 file c-553913.0.r553913/3766 K 26 patch-include_ixp__local.h V 28 file e-553913.0.r553913/4055 K 20 patch-include_util.h V 28 file g-553913.0.r553913/4354 K 19 patch-include_x11.h V 28 file i-553913.0.r553913/4647 END ENDREP id: 5-336942.0.r553913/5569 type: dir pred: 5-336942.0.r428551/1946 count: 2 text: 553913 4939 617 0 07f2c613d803e902701b596caaae66f9 cpath: /head/x11-wm/wmii-devel/files copyroot: 0 / PLAIN K 8 Makefile V 28 file 4-241037.0.r553913/2584 K 8 distinfo V 32 file 7-241037.0.r340717/14993673 K 5 files V 27 dir 5-336942.0.r553913/5569 K 9 pkg-descr V 28 file 9-241037.0.r348533/1129 K 9 pkg-plist V 27 file b-241037.0.r439055/526 END ENDREP id: 2-241037.0.r553913/6008 type: dir pred: 2-241037.0.r517000/416680 count: 26 text: 553913 5755 240 0 deffed8ba66d07029a2f79222338707c cpath: /head/x11-wm/wmii-devel copyroot: 0 / PLAIN K 8 Makefile V 27 file x-12323.0.r552224/1340 K 9 afterstep V 25 dir 2-3419.0.r533980/1244 K 16 afterstep-stable V 27 dir p-3419.0.r517000/356380 K 5 amiwm V 27 dir 2-8611.0.r517000/357117 K 6 antiwm V 29 dir 4-227877.0.r517000/357810 K 7 aphelia V 26 dir 4-492352.0.r523082/517 K 7 awesome V 27 dir 4-200236.0.r545788/2563 K 15 awesome-vicious V 27 dir 4-296258.0.r542515/1100 K 6 bbkeys V 28 dir 4-30856.0.r517000/359852 K 7 bbpager V 28 dir 4-31573.0.r517000/360554 K 5 berry V 27 dir 4-541087.0.r541087/3935 K 8 blackbox V 28 dir 2-11444.0.r517000/361301 K 5 bspwm V 27 dir 4-375184.0.r544143/1111 K 4 cage V 27 dir 4-500120.0.r553545/1086 K 7 chamfer V 27 dir 4-517213.0.r546307/1104 K 6 compiz V 29 dir ckm-191544.0.r551440/1412 K 20 compiz-plugins-extra V 29 dir e-198145.0.r517000/364187 K 19 compiz-plugins-main V 26 dir i-198130.0.r546769/611 K 26 compiz-plugins-unsupported V 34 dir e-198148.0-539271.r539271/2250 K 26 compizconfig-backend-gconf V 27 dir 6-198925.0.r538818/2920 K 7 compton V 27 dir 4-321749.0.r517931/2213 K 4 ctwm V 23 dir 2-423.0.r523493/537 K 3 cwm V 30 dir 4-348819.0.r550400/1409852 K 9 devilspie V 29 dir 4-111484.0.r517047/172662 K 3 dwm V 26 dir 4-169125.0.r545149/561 K 3 e16 V 27 dir 2-6718.0.r550824/924291 K 8 e16-docs V 36 dir 4-117225.0-375748.r517000/371517 K 7 echinus V 27 dir 4-219625.0.r518206/2281 K 7 emerald V 29 dir cmh-191544.0.r538818/4414 K 13 enlightenment V 25 dir f-6718.0.r548256/1239 K 7 epplets V 28 dir 2-22650.0.r517000/375288 K 9 euclid-wm V 29 dir 4-384882.0.r517000/375980 K 6 evilwm V 28 dir 4-34815.0.r517000/376623 K 5 fbcmd V 29 dir 4-119823.0.r517000/377271 K 7 fluxbox V 28 dir 4-51427.0.r517000/378002 K 7 fluxter V 28 dir 4-87317.0.r517000/378651 K 4 flwm V 29 dir 2-223970.0.r517000/379334 K 5 fvwm2 V 27 dir 2-2813.0.r517000/380058 K 8 gcompmgr V 29 dir 4-156290.0.r517000/380803 K 12 herbstluftwm V 27 dir 4-311201.0.r538405/1103 K 6 hikari V 27 dir 4-502115.0.r553161/1085 K 9 hs-xmonad V 30 dir 4-202265.0.r545088/1060092 K 2 i3 V 27 dir 4-233535.0.r552803/1020 K 7 i3-gaps V 27 dir 4-478485.0.r553609/1058 K 5 icewm V 25 dir 2-8616.0.r553712/1680 K 5 jewel V 28 dir 4-60019.0.r517000/385019 K 3 jwm V 29 dir 4-152288.0.r517000/385747 K 8 kickshaw V 27 dir 4-524618.0.r524618/2365 K 6 larswm V 28 dir 4-36640.0.r517000/386395 K 15 libcompizconfig V 27 dir 6-198924.0.r538818/5167 K 10 libdockapp V 35 dir 2-20266.0-318340.r517000/387168 K 10 libwraster V 27 dir 4-239792.0.r544815/5525 K 3 lwm V 28 dir 2-10357.0.r517000/388609 K 19 lxappearance-obconf V 29 dir 4-432396.0.r517000/389355 K 5 lxmed V 30 dir 4-330799.0.r518482/1732869 K 4 lxqt V 26 dir 4-491571.0.r539723/464 K 10 lxqt-panel V 27 dir 4-476292.0.r539720/3413 K 12 lxqt-session V 27 dir 4-491111.0.r539716/1802 K 9 lxsession V 29 dir 4-215455.0.r517000/391577 K 5 marco V 28 dir 7h-367830.0.r551441/1660 K 4 mcwm V 27 dir 4-271111.0.r519005/1235 K 8 metacity V 26 dir 4-59686.0.r550526/1931 K 6 muffin V 31 dir 1n1-372768.0.r524409/998234 K 6 mutter V 28 dir 10x-244923.0.r553752/626 K 6 obconf V 28 dir 4-91132.0.r517047/175640 K 9 obconf-qt V 27 dir 4-482157.0.r539722/1529 K 7 obpager V 29 dir 4-229642.0.r517000/398050 K 7 openbox V 28 dir r-11444.0.r517000/399535 K 8 oroborus V 26 dir 4-41675.0.r547250/2547 K 5 pager V 28 dir 4-70559.0.r517047/177098 K 10 peksystray V 29 dir 4-116480.0.r517000/400929 K 5 pekwm V 26 dir 4-69358.0.r536021/2259 K 6 phluid V 29 dir 4-46052.0.r431996/1643352 K 4 phoc V 27 dir 4-542477.0.r553575/1116 K 5 picom V 34 dir 4-321749.0-517931.r553199/2245 K 5 piewm V 23 dir 2-491.0.r546348/727 K 19 plasma5-kdecoration V 30 dir cz-468495.0.r553460/813999 K 12 plasma5-kwin V 30 dir d9-468495.0.r553460/815047 K 3 pwm V 29 dir 4-33303.0.r536752/1219325 K 5 qtile V 27 dir 4-315511.0.r520877/1403 K 6 ratmen V 29 dir 4-208847.0.r517000/403790 K 9 ratpoison V 28 dir 4-38337.0.r517001/440944 K 17 rubygem-uh-layout V 27 dir 4-432308.0.r457195/1025 K 13 rubygem-uh-wm V 27 dir 4-432530.0.r452685/1069 K 7 sawfish V 27 dir c-163799.0.r546916/1763 K 8 selectwm V 28 dir 4-99520.0.r517047/179205 K 9 skippy-xd V 36 dir 4-126201.0-482283.r517000/406697 K 8 spectrwm V 26 dir k-236877.0.r542818/602 K 7 stumpwm V 36 dir c-208850.0-448234.r553469/778692 K 6 subtle V 26 dir 4-429718.0.r520884/650 K 4 sway V 27 dir u-489493.0.r553545/1824 K 6 tinywm V 29 dir 4-126531.0.r517000/408837 K 8 transset V 36 dir 4-145623.0-318614.r516607/871663 K 6 treewm V 25 dir 4-97951.0.r548187/687 K 5 tvtwm V 23 dir 2-535.0.r546780/766 K 3 twm V 29 dir cr8-191544.0.r539272/1587 K 4 vtwm V 28 dir 2-15585.0.r517000/410891 K 4 w9wm V 28 dir 4-39974.0.r517000/411535 K 7 wayfire V 27 dir s-507480.0.r553545/2559 K 21 wayfire-plugins-extra V 27 dir 2-544186.0.r544186/2392 K 11 windowmaker V 24 dir 2-8480.0.r546149/599 K 3 wm2 V 27 dir 2-7236.0.r517000/413704 K 10 wmakerconf V 25 dir 2-20999.0.r552877/600 K 8 wmanager V 28 dir 4-59888.0.r517000/415188 K 15 wmanager-addons V 26 dir 2-213609.0.r424938/711 K 8 wmconfig V 26 dir 4-97179.0.r513657/1161 K 4 wmii V 27 dir 4-136670.0.r553912/4965 K 10 wmii-devel V 27 dir 2-241037.0.r553913/6008 K 6 wmname V 29 dir 4-239127.0.r517000/417381 K 3 wmx V 35 dir 2-11503.0-399968.r517000/418080 K 8 xcompmgr V 29 dir 4-125020.0.r516607/873064 K 5 xfce4 V 28 dir j-7733.0.r536752/1219919 K 13 xfce4-desktop V 25 dir 4-85751.0.r539724/574 K 11 xfce4-panel V 26 dir 4-85765.0.r533269/1110 K 20 xfce4-panel-profiles V 27 dir 4-475914.0.r523102/2746 K 13 xfce4-session V 26 dir 4-95692.0.r536406/1011 K 8 xfce4-wm V 26 dir 4-80707.0.r553863/1046 K 6 yeahwm V 27 dir 4-552224.0.r552224/2602 END ENDREP id: 1-40.0.r553913/11786 type: dir pred: 1-40.0.r553912/10739 count: 5383 text: 553913 6191 5582 0 9e91729887c9af4e9bb53d119f35c667 cpath: /head/x11-wm copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r422906/41 K 14 .gitattributes V 26 file 1-411777.0.r467740/54 K 11 .gitauthors V 27 file 1-467739.0.r547190/454 K 10 .gitignore V 26 file 1-348322.0.r458023/77 K 11 .gitmessage V 27 file 3-457790.0.r457790/987 K 7 CHANGES V 26 file 1-99373.0.r552944/500 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r521639/51 K 4 GIDs V 29 file 1-168311.0.r553462/12186 K 8 Keywords V 27 dir 1-314142.0.r552967/1308 K 5 LEGAL V 25 file 1-748.0.r546333/2239 K 5 MOVED V 26 file 1-69878.0.r553868/497 K 8 Makefile V 23 file 1-6.0.r516635/2409 K 2 Mk V 22 dir 1-5.0.r553846/7506 K 6 README V 25 file 1-2408.0.r494236/641 K 9 Templates V 24 dir 1-2932.0.r544150/817 K 5 Tools V 26 dir 3-15302.0.r545812/3025 K 4 UIDs V 29 file 4-168311.0.r553462/12468 K 8 UPDATING V 28 file 1-102685.0.r553713/5944 K 13 accessibility V 27 dir 1-42583.0.r551930/70013 K 6 arabic V 27 dir 1-38973.0.r553614/51959 K 9 archivers V 25 dir 1-242.0.r553390/14064 K 5 astro V 24 dir 1-301.0.r553681/7342 K 5 audio V 25 dir 1-148.0.r553886/45637 K 4 base V 27 dir 1-420954.0.r542956/1557 K 10 benchmarks V 23 dir 1-62.0.r553853/6031 K 7 biology V 25 dir 1-9066.0.r553693/9987 K 3 cad V 24 dir 1-276.0.r553834/6933 K 7 chinese V 26 dir 1-3770.0.r553614/58810 K 5 comms V 24 dir 1-76.0.r553711/11473 K 10 converters V 26 dir 1-1561.0.r553469/10633 K 9 databases V 25 dir 1-771.0.r553894/58811 K 9 deskutils V 26 dir 1-2098.0.r553902/14918 K 5 devel V 25 dir 1-73.0.r553905/378955 K 3 dns V 26 dir 1-6145.0.r553910/13607 K 7 editors V 23 dir 4-6.0.r553883/14327 K 9 emulators V 24 dir 1-181.0.r553842/9550 K 7 finance V 25 dir 1-4110.0.r553682/8708 K 6 french V 28 dir 1-25673.0.r553614/142850 K 3 ftp V 24 dir 1-199.0.r553854/5854 K 5 games V 25 dir 1-104.0.r553869/58760 K 6 german V 27 dir 1-7451.0.r553614/144781 K 8 graphics V 24 dir 1-94.0.r553839/57319 K 6 hebrew V 28 dir 3-31142.0.r553614/146018 K 9 hungarian V 29 dir 1p-38973.0.r553614/147289 K 3 irc V 23 dir 1-42.0.r553430/6596 K 8 japanese V 26 dir 1-410.0.r553614/162209 K 4 java V 25 dir 1-2798.0.r553882/7633 K 6 korean V 27 dir 1-5873.0.r553614/165186 K 4 lang V 24 dir 1-15.0.r553892/18640 K 4 mail V 24 dir 1-57.0.r553849/39725 K 4 math V 25 dir 1-162.0.r553784/51682 K 4 misc V 24 dir 7-35.0.r553787/28843 K 10 multimedia V 25 dir d-333.0.r553832/25206 K 3 net V 24 dir 1-22.0.r553870/83350 K 6 net-im V 28 dir 15-11144.0.r553831/10402 K 8 net-mgmt V 26 dir r-1011.0.r553803/22268 K 7 net-p2p V 26 dir g-29106.0.r553893/6925 K 4 news V 24 dir 1-145.0.r553532/4341 K 6 polish V 29 dir tv-38973.0.r553614/166741 K 10 ports-mgmt V 25 dir 1-5132.0.r552866/4949 K 10 portuguese V 28 dir 1-17842.0.r553614/168767 K 5 print V 24 dir 1-79.0.r553798/14354 K 7 russian V 27 dir 1-1559.0.r553614/171325 K 7 science V 26 dir n-5356.0.r553775/20101 K 8 security V 25 dir 1-269.0.r553884/70567 K 6 shells V 24 dir w-6.0.r553367/571367 K 8 sysutils V 25 dir b-339.0.r553865/78291 K 8 textproc V 26 dir 1-322.0.r553906/103902 K 9 ukrainian V 28 dir g-39704.0.r553614/172680 K 10 vietnamese V 27 dir 1-4812.0.r553614/174379 K 3 www V 26 dir 1-114.0.r553909/134974 K 3 x11 V 24 dir 1-16.0.r553845/27223 K 10 x11-clocks V 27 dir 1-931.0.r551930/1407338 K 11 x11-drivers V 28 dir 1-157567.0.r552105/61141 K 6 x11-fm V 24 dir 1-691.0.r553862/3111 K 9 x11-fonts V 25 dir 1-543.0.r553901/18821 K 11 x11-servers V 25 dir 1n-710.0.r553724/1883 K 10 x11-themes V 26 dir 1-14410.0.r553519/9406 K 12 x11-toolkits V 25 dir 1-120.0.r553907/14135 K 6 x11-wm V 24 dir 1-40.0.r553913/11786 END ENDREP id: 2-1.0.r553913/15532 type: dir pred: 2-1.0.r553912/14484 count: 543797 text: 553913 11953 3566 0 922444d468c4224f97f5a1997d3e64e3 props: 458023 3927 157 0 4d85142843815bcc29c89469bccb873c cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r553911/21336 K 4 head V 23 dir 2-1.0.r553913/15532 K 8 projects V 24 dir 0-377393.0.r441387/0 K 8 svnadmin V 22 dir 3-1.0.r551508/1286 K 4 tags V 22 dir 8-1.0.r551657/5646 END ENDREP id: 0.0.r553913/15969 type: dir pred: 0.0.r553912/14921 count: 553913 text: 553913 15751 205 0 c7b7aae00176331bea78d4662a4c9bd4 props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 61 4-241037.0.t553912-bveh modify-file true false /head/x11-wm/wmii-devel/Makefile _5.0.t553912-bveh add-file true true /head/x11-wm/wmii-devel/files/patch-cmd_wmii9menu.c _8.0.t553912-bveh add-file true true /head/x11-wm/wmii-devel/files/patch-cmd_wmii_dat.h _a.0.t553912-bveh add-file true true /head/x11-wm/wmii-devel/files/patch-cmd_wmii_event.c _c.0.t553912-bveh add-file true true /head/x11-wm/wmii-devel/files/patch-cmd_wmiir.c _e.0.t553912-bveh add-file true true /head/x11-wm/wmii-devel/files/patch-include_ixp__local.h _g.0.t553912-bveh add-file true true /head/x11-wm/wmii-devel/files/patch-include_util.h _i.0.t553912-bveh add-file true true /head/x11-wm/wmii-devel/files/patch-include_x11.h 15969 16193