- fixes for 0.65.0

Changed files:
    blackbox-am_fixes.patch -> 1.4
    blackbox-pipe.patch -> 1.2

diff --git a/blackbox-am_fixes.patch b/blackbox-am_fixes.patch
index 6c2baee4dd85e591abd9521822a6964352a081cd..368481c6c52e6db22815aee3467304a7ece57068 100644 (file)
--- a/blackbox-am_fixes.patch
+++ b/blackbox-am_fixes.patch
@@ -1,17 +1,16 @@
-diff -ur blackbox-0.62.0.orig/data/Makefile.am blackbox-0.62.0/data/Makefile.am
---- blackbox-0.62.0.orig/data/Makefile.am      Sat Jan 19 17:15:50 2002
-+++ blackbox-0.62.0/data/Makefile.am   Mon Jan 21 01:52:18 2002
-@@ -13,5 +13,5 @@
-       @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," @srcdir@/menu.in > menu
+--- blackbox-0.65.0/data/Makefile.am.orig      Fri Nov  1 17:53:06 2002
++++ blackbox-0.65.0/data/Makefile.am   Fri Nov  1 17:53:32 2002
+@@ -14,7 +14,7 @@
  
  install-data-local: menu
--      test -f $(DESTDIR)$(pkgdatadir)/menu || \
+       test -f $(DESTDIR)$(pkgdatadir)/menu || \
 -      $(INSTALL_DATA) menu $(DESTDIR)$(pkgdatadir)
-+      ${mkinstalldirs} $(DESTDIR)$(sysconfdir)
 +      $(INSTALL_DATA) menu $(DESTDIR)$(sysconfdir)
-diff -ur blackbox-0.62.0.orig/src/Makefile.am blackbox-0.62.0/src/Makefile.am
---- blackbox-0.62.0.orig/src/Makefile.am       Sat Jan  5 01:04:23 2002
-+++ blackbox-0.62.0/src/Makefile.am    Mon Jan 21 01:52:38 2002
+ 
+ uninstall-local:
+       rm -f $(pkgdatadir)/menu
+--- blackbox-0.65.0/src/Makefile.am.orig       Fri Nov  1 17:54:34 2002
++++ blackbox-0.65.0/src/Makefile.am    Fri Nov  1 17:56:32 2002
 @@ -19,8 +19,8 @@
  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  # DEALINGS IN THE SOFTWARE.
@@ -21,5 +20,5 @@ diff -ur blackbox-0.62.0.orig/src/Makefile.am blackbox-0.62.0/src/Makefile.am
 +DEFAULT_MENU=$(sysconfdir)/menu
 +DEFAULT_STYLE=$(sysconfdir)/styles/Results
  
- CPPFLAGS= @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ \
- @DEBUG@ @NEWWMSPEC@ @NLS@ @TIMEDCACHE@ \
+ CPPFLAGS= @CPPFLAGS@ @SHAPE@ @ORDEREDPSEUDO@ \
+ @DEBUG@ @NLS@ @TIMEDCACHE@ \

diff --git a/blackbox-pipe.patch b/blackbox-pipe.patch
index f941639b13b8d4236edebc3e6e068ee638a22d53..107ae1cfb7d2675f99523c4d3bdd5a75a50d59da 100644 (file)
--- a/blackbox-pipe.patch
+++ b/blackbox-pipe.patch
@@ -1,60 +1,27 @@
---- blackbox-0.62.1/src/Screen.cc      Sat Jan 12 12:13:09 2002
-+++ blackbox-0.62.1.with_pipe/src/Screen.cc    Sun Mar  3 20:32:30 2002
-@@ -1710,7 +1710,13 @@
-   Bool defaultMenu = True;
+--- blackbox-0.65.0/src/Screen.cc.orig Fri Nov  1 18:00:26 2002
++++ blackbox-0.65.0/src/Screen.cc      Fri Nov  1 18:14:37 2002
+@@ -1159,7 +1159,13 @@
+   bool defaultMenu = True;
  
    if (blackbox->getMenuFilename()) {
 -    FILE *menu_file = fopen(blackbox->getMenuFilename(), "r");
 +    int pipe_menu = 0;
-+      FILE *menu_file;
-+      if (*(blackbox->getMenuFilename()) == '|') {
-+              pipe_menu = 1;
-+              menu_file = popen((blackbox->getMenuFilename()) + 1, "r");
-+      } 
++    FILE *menu_file;
++    if (*(blackbox->getMenuFilename()) == '|') {
++      pipe_menu = 1;
++      menu_file = popen((blackbox->getMenuFilename()) + 1, "r");
++    }
 +    else menu_file = fopen(blackbox->getMenuFilename(), "r");
  
      if (!menu_file) {
        perror(blackbox->getMenuFilename());
-@@ -1758,7 +1764,8 @@
-         }
-       }
+@@ -1207,7 +1213,8 @@
+           }
+         }
        }
 -      fclose(menu_file);
-+        if (pipe_menu) pclose(menu_file);
++      if (pipe_menu) pclose(menu_file);
 +      else fclose(menu_file);
      }
    }
  
-@@ -1958,12 +1965,18 @@
-           }
- 
-           if (newfile) {
--            FILE *submenufile = fopen(newfile, "r");
-+                int pipe_submenu = 0;
-+                FILE *submenufile;
-+                if (*newfile == '|') {
-+                  pipe_submenu = 1;
-+                      submenufile = popen(newfile + 1, "r");
-+                }
-+            else submenufile = fopen(newfile, "r");
- 
-             if (submenufile) {
-                 struct stat buf;
--                if (fstat(fileno(submenufile), &buf) ||
--                    (! S_ISREG(buf.st_mode))) {
-+                if (!pipe_submenu && (fstat(fileno(submenufile), &buf) ||
-+                    (! S_ISREG(buf.st_mode)))) {
-                   fprintf(stderr,
-                         i18n->getMessage(ScreenSet, ScreenINCLUDEErrorReg,
-                            "BScreen::parseMenuFile: [include] error: "
-@@ -1974,8 +1987,8 @@
-               if (! feof(submenufile)) {
-                 if (! parseMenuFile(submenufile, menu))
-                   blackbox->saveMenuFilename(newfile);
--
--                fclose(submenufile);
-+          if (pipe_submenu) pclose(submenufile);
-+                else fclose(submenufile);
-               }
-             } else
-               perror(newfile);