require notcurses 2.3.9+, adapt to new defines

dankamongmen · Jul 13, 2021 · fd3a1fb · fd3a1fb
1 parent b6b84ae
commit fd3a1fb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,7 @@ add_compile_options(-Wall -Wextra -W -Wshadow -Wformat -fexceptions)
 find_package(PkgConfig REQUIRED)
 find_package(Threads)
 set_package_properties(Threads PROPERTIES TYPE REQUIRED)
-find_package(Notcurses 2.2.9 CONFIG)
+find_package(Notcurses 2.3.9 CONFIG)
 set_package_properties(Notcurses PROPERTIES TYPE REQUIRED)
 pkg_check_modules(LIBATASMART REQUIRED libatasmart>=0.19)
 pkg_check_modules(LIBBLKID REQUIRED blkid>=2.20.1)

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Dependencies:
  - libcryptsetup 2.1.5+
  - libdevmapper 1.02.74+
  - libnettle 3.5.1+
- - libnotcurses 2.2.9+
+ - libnotcurses 2.3.9+
  - libpci 3.1.9+
  - libpciaccess 0.13.1+
  - libreadline 8.0+

diff --git a/src/notcurses/notcurses.c b/src/notcurses/notcurses.c
@@ -6047,8 +6047,8 @@ create_menu(struct ncplane* n){
   struct ncmenu_options mopts = {
     .sections = sections,
     .sectioncount = sizeof(sections) / sizeof(*sections),
-    .headerchannels = CHANNELS_RGB_INITIALIZER(0xff, 0xff, 0xff, 0x35, 0x1c, 0x35),
-    .sectionchannels = CHANNELS_RGB_INITIALIZER(0xd6, 0x70, 0xd6, 0x00, 0x00, 0x00),
+    .headerchannels = NCCHANNELS_INITIALIZER(0xff, 0xff, 0xff, 0x35, 0x1c, 0x35),
+    .sectionchannels = NCCHANNELS_INITIALIZER(0xd6, 0x70, 0xd6, 0x00, 0x00, 0x00),
   };
   struct ncmenu* nmenu = ncmenu_create(n, &mopts);
   return nmenu;